Skip to content

Commit cc9efde

Browse files
authored
Merge pull request #117 from movementlabsxyz/l-monninger/fix-secure-signer
chore: fix secure signer
2 parents 8f34d61 + 829ed5e commit cc9efde

File tree

32 files changed

+1076
-184
lines changed

32 files changed

+1076
-184
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
command:
1212
# cargo checks and tests
1313
- cargo check --all-targets
14-
- cargo test
14+
- RUST_MIN_STACK=8388608 cargo test
1515

1616
with:
1717
command: ${{ matrix.command }}

Cargo.lock

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

Cargo.toml

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ movement-types = { git = "https://github.com/movementlabsxyz/movement.git", rev
111111
maptos-execution-util = { git = "https://github.com/movementlabsxyz/movement.git", rev = "07d5fe82f2c824a7f7e032c9dce339afdbbcb5a0" }
112112
movement-util = { git = "https://github.com/movementlabsxyz/movement.git", rev = "07d5fe82f2c824a7f7e032c9dce339afdbbcb5a0" }
113113
aptos-framework-pre-l1-merge-release = { git = "https://github.com/movementlabsxyz/movement.git", rev = "07d5fe82f2c824a7f7e032c9dce339afdbbcb5a0" }
114-
114+
movement-signer = { git = "https://github.com/movementlabsxyz/movement.git", rev = "07d5fe82f2c824a7f7e032c9dce339afdbbcb5a0" }
115+
movement-signer-loader = { git = "https://github.com/movementlabsxyz/movement.git", rev = "07d5fe82f2c824a7f7e032c9dce339afdbbcb5a0" }
116+
movement-config = { git = "https://github.com/movementlabsxyz/movement.git", rev = "07d5fe82f2c824a7f7e032c9dce339afdbbcb5a0" }
115117

116118
# aptos-core
117119
aptos-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "cb3b7b02f68c7d6982257e4c59955d0e63b513db" }
@@ -131,11 +133,6 @@ aptos-executor-types = { git = "https://github.com/movementlabsxyz/aptos-core.gi
131133
aptos-vm-genesis = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "cb3b7b02f68c7d6982257e4c59955d0e63b513db" }
132134

133135

134-
# secure-signing
135-
secure-signer = { git = "https://github.com/movementlabsxyz/secure-signing.git", rev = "f37eebd6d494d21b26b2faa44e1188de42ff1007" }
136-
secure-signer-loader = { git = "https://github.com/movementlabsxyz/secure-signing.git", rev = "f37eebd6d494d21b26b2faa44e1188de42ff1007" }
137-
secure-signer-aws-kms = { git = "https://github.com/movementlabsxyz/secure-signing.git", rev = "f37eebd6d494d21b26b2faa44e1188de42ff1007" }
138-
139136
# kestrel
140137
kestrel = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "3220d704df7e06d1dcc5266e15eaf05db86fdb07" }
141138
jsonlvar = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "3220d704df7e06d1dcc5266e15eaf05db86fdb07" }
@@ -193,9 +190,11 @@ mtma-node-test-global-storage-includes-criterion = { path = "checks/node/citeria
193190
mtma-node-test-global-storage-not-empty-criterion = { path = "checks/node/citeria/global-storage-not-empty" }
194191

195192

196-
### e2e
193+
### migrator
197194
mtma-migrator-test-types = { path = "checks/migrator/util/types" }
198195
mtma-migrator-test-accounts-equal-criterion = { path = "checks/migrator/citeria/accounts-equal" }
196+
mtma-migrator-test-balances-equal-criterion = { path = "checks/migrator/citeria/balances-equal" }
197+
199198
## util
200199
bcs-ext = { path = "util/bcs-ext" }
201200
movement-syncing = { path = "util/movement/syncing" }
@@ -255,12 +254,4 @@ debug = true
255254
[patch.crates-io]
256255
serde-reflection = { git = "https://github.com/aptos-labs/serde-reflection", rev = "73b6bbf748334b71ff6d7d09d06a29e3062ca075" }
257256
merlin = { git = "https://github.com/aptos-labs/merlin" }
258-
x25519-dalek = { git = "https://github.com/aptos-labs/x25519-dalek", branch = "zeroize_v1" }
259-
futures = { git = "https://github.com/aptos-labs/futures-rs", branch = "backport" }
260-
futures-channel = { git = "https://github.com/aptos-labs/futures-rs", branch = "backport" }
261-
futures-executor = { git = "https://github.com/aptos-labs/futures-rs", branch = "backport" }
262-
futures-core = { git = "https://github.com/aptos-labs/futures-rs", branch = "backport" }
263-
futures-util = { git = "https://github.com/aptos-labs/futures-rs", branch = "backport" }
264-
futures-sink = { git = "https://github.com/aptos-labs/futures-rs", branch = "backport" }
265-
futures-io = { git = "https://github.com/aptos-labs/futures-rs", branch = "backport" }
266-
futures-task = { git = "https://github.com/aptos-labs/futures-rs", branch = "backport" }
257+
x25519-dalek = { git = "https://github.com/aptos-labs/x25519-dalek", branch = "zeroize_v1" }

0 commit comments

Comments
 (0)