Skip to content

Commit a414093

Browse files
authored
Adding support for google oauth2 authentication in the omni-executor (#3244)
1 parent 60105a2 commit a414093

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+744
-116
lines changed

tee-worker/omni-executor/Cargo.lock

Lines changed: 342 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tee-worker/omni-executor/Cargo.toml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@ members = [
33
"executor-crypto",
44
"executor-core",
55
"executor-worker",
6+
"executor-storage",
7+
"executor-primitives",
68
"ethereum/intent-executor",
79
"ethereum/intent-executor",
810
"heima/authentication",
911
"heima/identity-verification",
1012
"native-task-handler",
13+
"oauth-providers",
1114
"parentchain/listener",
1215
"parentchain/api-interface",
1316
"parentchain/rpc-client",
1417
"parentchain/signer",
15-
"primitives",
1618
"rpc-server",
17-
"executor-storage",
1819
"solana/intent-executor",
1920
]
2021

@@ -38,6 +39,7 @@ log = "0.4.22"
3839
parity-scale-codec = "3.6.12"
3940
rand = "0.8.5"
4041
regex = "1.7"
42+
reqwest = { version = "0.12", features = ["json"] }
4143
ring = "0.16.20"
4244
rsa = "0.9.7"
4345
scale-encode = "0.10.0"
@@ -53,21 +55,23 @@ subxt = "0.38.0"
5355
subxt-core = "0.38.0"
5456
subxt-signer = { version = "0.38.0", features = ["subxt"] }
5557
tokio = "1.43.0"
58+
url = "2.5.4"
5659

5760
# Local dependencies
5861
ethereum-intent-executor = { path = "ethereum/intent-executor" }
5962
executor-core = { path = "executor-core" }
6063
executor-crypto = { path = "executor-crypto" }
64+
executor-primitives = { path = "executor-primitives" }
6165
executor-storage = { path = "executor-storage" }
6266
heima-authentication = { path = "heima/authentication" }
6367
heima-identity-verification = { path = "heima/identity-verification" }
6468
heima-primitives = { package = "core-primitives", path = "../../common/primitives/core", default-features = false, features = ["std"] }
6569
native-task-handler = { path = "native-task-handler" }
70+
oauth-providers = { path = "oauth-providers" }
6671
parentchain-api-interface = { path = "parentchain/api-interface" }
6772
parentchain-listener = { path = "parentchain/listener" }
6873
parentchain-rpc-client = { path = "parentchain/rpc-client" }
6974
parentchain-signer = { path = "parentchain/signer" }
70-
primitives = { path = "primitives" }
7175
rpc-server = { path = "rpc-server" }
7276
solana-intent-executor = { path = "solana/intent-executor" }
7377

tee-worker/omni-executor/executor-core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ regex = { workspace = true }
1212
tokio = { workspace = true }
1313

1414
# Local dependencies
15+
executor-primitives = { workspace = true }
1516
heima-authentication = { workspace = true }
16-
primitives = { workspace = true }
1717

1818
[lints]
1919
workspace = true

tee-worker/omni-executor/executor-core/src/fetcher.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// along with Litentry. If not, see <https://www.gnu.org/licenses/>.
1616

1717
use async_trait::async_trait;
18-
use primitives::GetEventId;
18+
use executor_primitives::GetEventId;
1919

2020
/// Returns the last finalized block number
2121
#[async_trait]

tee-worker/omni-executor/executor-core/src/listener.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use tokio::{runtime::Handle, sync::oneshot::Receiver};
2222
use crate::event_handler::{Error, EventHandler};
2323
use crate::fetcher::{EventsFetcher, LastFinalizedBlockNumFetcher};
2424
use crate::sync_checkpoint_repository::{Checkpoint, CheckpointRepository};
25-
use primitives::GetEventId;
25+
use executor_primitives::GetEventId;
2626

2727
/// Component, used to listen to chain and execute requested intents
2828
/// Requires specific implementations of:

tee-worker/omni-executor/executor-core/src/native_call.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
use executor_primitives::Identity;
12
use heima_authentication::auth_token::AuthOptions;
23
use parity_scale_codec::{Decode, Encode};
3-
use primitives::Identity;
44

55
#[derive(Encode, Decode, Clone, Debug, PartialEq, Eq)]
66
#[allow(non_camel_case_types)]

tee-worker/omni-executor/primitives/Cargo.toml renamed to tee-worker/omni-executor/executor-primitives/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "primitives"
2+
name = "executor-primitives"
33
version = "0.1.0"
44
authors = ['Trust Computing GmbH <[email protected]>']
55
edition.workspace = true

tee-worker/omni-executor/primitives/src/lib.rs renamed to tee-worker/omni-executor/executor-primitives/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ pub mod signature;
1818
pub mod utils;
1919
pub use heima_primitives::{
2020
omni_account::{MemberAccount, OmniAccountAuthType},
21-
BlockNumber, Hash, Identity, Nonce, ShardIdentifier, Web2IdentityType,
21+
AccountId, BlockNumber, Hash, Identity, Nonce, ShardIdentifier, Web2IdentityType,
2222
};
23-
pub use sp_core::crypto::AccountId32 as AccountId;
2423

2524
use parity_scale_codec::{Decode, Encode};
2625
use std::fmt::Debug;

0 commit comments

Comments
 (0)