Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Framework Cleanup #108

Closed
wants to merge 316 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
316 commits
Select commit Hold shift + click to select a range
06443b8
fix: debugging transaction_by hash issue.
l-monninger Apr 25, 2024
723959f
fix bug
0xmovses Apr 26, 2024
6239f63
fmt
0xmovses Apr 26, 2024
8767d92
consensus-types: remove request_response
mzabaluev Apr 18, 2024
b116b2e
cut out tokio from consensus-types
mzabaluev Apr 19, 2024
2c3f7f0
aptos-vm: cut out use of futures
mzabaluev Apr 22, 2024
61bd4ee
Cut out aptos-consensus and dependent crates
mzabaluev Apr 24, 2024
224dd28
aptos-network: fix up noise imports in tests
mzabaluev Apr 24, 2024
8b25298
experimiental/runtimes: remove tokio dep
mzabaluev Apr 29, 2024
8319a2b
aptos-dkg: relax dep on aptos-experimental-runtimes
mzabaluev Apr 29, 2024
bd3e72f
aptos-logger: cut out async logging
mzabaluev Apr 23, 2024
e62577b
Merge pull request #10 from movementlabsxyz/mikhail/trim-aptos-logger
l-monninger May 2, 2024
8bf8f2a
Merge branch 'monza' into 0xmovses/ENG-206-implement-block-reversion
0xmovses May 3, 2024
27c8c96
add reversion to Writer trait, enable epoch reversion
0xmovses May 6, 2024
7d807dc
add new commit reversion method
0xmovses May 6, 2024
187ecc3
Merge pull request #7 from movementlabsxyz/mikhail/de-async
l-monninger May 9, 2024
53c6948
Merge pull request #6 from movementlabsxyz/0xmovses/ENG-206-implement…
l-monninger May 9, 2024
02d3236
chore: remove logging.
May 18, 2024
99cf0d3
fix: trying miscellaneous state view id.
May 18, 2024
451a904
Remove calls to AptosDataBuilder::is_async
mzabaluev May 31, 2024
ed341dc
aptos-db: remove reversion helper method
mzabaluev Jun 1, 2024
b2fa010
storage-interface: add FinalityView
mzabaluev Jun 1, 2024
0edea03
storage-interface: tests for FinalityView
mzabaluev Jun 1, 2024
9089a3b
storage-interface: blanket impl DbReader for Arc
mzabaluev Jun 3, 2024
44a86da
update set ledger info method, update tests
0xmovses Jun 4, 2024
54ab11b
update tests update set method
0xmovses Jun 5, 2024
fc037ca
storage-interface: fixed up finality_view tests
mzabaluev Jun 5, 2024
9b20994
storage-interface: fix DbReader impl for Arc
mzabaluev Jun 5, 2024
d1a2d26
storage-interface: rename setter for FinalityView
mzabaluev Jun 5, 2024
dfbb570
storage-interface: remove a dbg printout
mzabaluev Jun 6, 2024
3797a33
Revert "fix: debugging transaction_by hash issue."
mzabaluev Jun 6, 2024
1c33fd1
storage-interface: finality_view tests ret Result
mzabaluev Jun 6, 2024
dee7114
storage-interface: latest state vew test
mzabaluev Jun 6, 2024
b5688df
storage-interface: clean up and comment
mzabaluev Jun 7, 2024
1731cce
storage: improve FinalityView set method
mzabaluev Jun 7, 2024
38dcecc
storage: more FinalityView testing
mzabaluev Jun 7, 2024
bf51211
Revert "storage: improve FinalityView set method"
mzabaluev Jun 7, 2024
b2be48e
api: expose AccountsApi::get_account_inner
mzabaluev Jun 7, 2024
f8a03f1
Merge pull request #13 from movementlabsxyz/mikhail/finalized-state
mzabaluev Jun 11, 2024
27c5f78
chore: api_connection_config should be public.
l-monninger Jun 12, 2024
44e32af
fix: pin diesel.
l-monninger Jun 13, 2024
16cf149
fix: pin diesel.
l-monninger Jun 13, 2024
496f560
fix: checking write table output.
l-monninger Jun 14, 2024
674d3a5
Merge pull request #14 from movementlabsxyz/l-monninger/faucet-instru…
l-monninger Jun 14, 2024
bd2d1be
aptos-db: revert_commit improvements
mzabaluev Jun 20, 2024
c7c987c
aptos-db: simplify signature of revert_commit
mzabaluev Jun 20, 2024
6cb0640
aptos-db: fix excessive batching
mzabaluev Jun 20, 2024
9c86dde
Merge pull request #22 from movementlabsxyz/mikhail/ledger-info-on-re…
mzabaluev Jun 20, 2024
6ce927e
vm-genesis: prevent division by zero
mzabaluev Jun 24, 2024
4925eb1
Merge pull request #23 from movementlabsxyz/mikhail/fix-zero-divide-o…
mzabaluev Jun 24, 2024
818e88f
fix: merge.
l-monninger Jul 2, 2024
3439ad6
fix: aptos-telemetry.
l-monninger Jul 2, 2024
6f7e6cc
fix: restoring aptos-admin-service.
l-monninger Jul 2, 2024
552af67
fix: aptos-inspection-service.
l-monninger Jul 2, 2024
298e3a8
fix: restore aptos-debugger.
l-monninger Jul 2, 2024
3fbd2ab
fix: grpc cache workers.
l-monninger Jul 2, 2024
f2b642a
fix: indexer-grpc-file-store.
l-monninger Jul 2, 2024
e059ce0
fix: indexer-grpc-integration-tests.
l-monninger Jul 2, 2024
5a80be9
fix: aptos-debugger.
l-monninger Jul 2, 2024
69e2a7e
fix: aptos-forge.
l-monninger Jul 2, 2024
a28b76e
fix: aptos-forge.
l-monninger Jul 2, 2024
0e582c6
fix: aptos-release-builder.
l-monninger Jul 2, 2024
e799aca
fix: aptos-rosetta.
l-monninger Jul 2, 2024
23cb2eb
feat(fin): update to match DbReader changes.
l-monninger Jul 2, 2024
d1918c1
fix: revert commit.
l-monninger Jul 2, 2024
6e0ac42
fix: revert commit.
l-monninger Jul 2, 2024
f3dfe09
fix: bad argument.
l-monninger Jul 2, 2024
643e6ec
fix: merge.
l-monninger Jul 8, 2024
d4f16c8
aptos-db: batching fixes in revert_commit
mzabaluev Jun 27, 2024
68a7b0e
aptos-db: reorder LedgerInfo commit on revert
mzabaluev Jun 28, 2024
03ab5ec
aptos-db: remove more on revert_commit
mzabaluev Jul 1, 2024
c22113d
aptos-db: remove unused imports in tests
mzabaluev Jul 1, 2024
07aca16
aptos-db: set in-memory ledger info on revert
mzabaluev Jul 2, 2024
d2146bf
fix: cherry-pick.
mzabaluev Jul 2, 2024
e94a25a
types: remove setter methods
mzabaluev Jul 2, 2024
7695748
aptos-db: truncate state merkle DB on revert
mzabaluev Jul 3, 2024
9bf884b
aptos-db: remove an unused test helper
mzabaluev Jul 3, 2024
ffd03b4
aptos-db: ResetLock
mzabaluev Jul 5, 2024
7602bf7
aptos-db: Use the state store lock on revert
mzabaluev Jul 5, 2024
2c0afa3
fix: cherry-pick.
mzabaluev Jul 4, 2024
c0cb182
fix: cherry-pick.
mzabaluev Jun 27, 2024
9e03a25
fix: cherry-pick.
mzabaluev Jun 28, 2024
cf8cc6f
fix: cherry-pick
mzabaluev Jul 1, 2024
d29fa61
fix: merge.
mzabaluev Jul 1, 2024
34f81b0
Merge pull request #40 from movementlabsxyz/l-monninger/sync-with-ups…
l-monninger Jul 8, 2024
f7896c1
movement: revert mod genesis from upstream
mzabaluev Jul 9, 2024
7018ed6
Remove debug printouts not present upstream
mzabaluev Jul 9, 2024
a3ddc83
Remove nft-metadata-crawler-parser again
mzabaluev Jul 9, 2024
db4d9e1
aptos-storage-interface: recover tests
mzabaluev Jul 9, 2024
986a639
Restore crates from upstream
mzabaluev Jul 9, 2024
cccee62
aptos-node: recover mod indexer
mzabaluev Jul 9, 2024
94a520e
aptos-db: update tests
mzabaluev Jul 9, 2024
b75af9d
fix(indexer-grpc-server-framework): fixup
mzabaluev Jul 9, 2024
436c7b0
Sync movement CLI from aptos-cli-v3.5.0
mzabaluev Jul 9, 2024
9dd70cc
Merge pull request #43 from movementlabsxyz/mikhail/sync-with-upstrea…
l-monninger Jul 9, 2024
bc283e6
fix(aptos-schemadb): revert single-threaded mode
mzabaluev Jul 10, 2024
b5029d5
Revert "revert single-threaded mode"
mzabaluev Jul 10, 2024
862cd10
fix: more feature-agnostic rocksdb API use
mzabaluev Jul 10, 2024
480701a
fix(aptos-release-builder): restore from upstream
mzabaluev Jul 10, 2024
ec980f9
fix: rename some aptos imports to movement
mzabaluev Jul 10, 2024
f4058ae
fix(aptos-smoke-test): restore from upstream
mzabaluev Jul 10, 2024
b53e8a0
fix(aptos-testcases): rename imports
mzabaluev Jul 10, 2024
4f47482
refactor(storage-interface): dyn FinalityView
mzabaluev Jul 10, 2024
76be1d3
fix: make get_transaction_by_hash_inner public
mzabaluev Jul 11, 2024
e4430d7
Merge pull request #30 from movementlabsxyz/l-monninger/sync-with-ups…
mzabaluev Jul 11, 2024
efdeabf
fix(aptos-db): set in-memory ledger info on revert
mzabaluev Jul 2, 2024
2458f53
refactor(aptos-db): use truncation helpers
mzabaluev Jul 2, 2024
23c783c
fix(aptos-db): use the state store lock on revert
mzabaluev Jul 5, 2024
7df2b52
fix(aptos-db): use get_synced_version on revert
mzabaluev Jul 11, 2024
1f929f5
fix(vm-genesis): fix zero division
mzabaluev Jul 11, 2024
b54d443
Merge pull request #44 from movementlabsxyz/mikhail/fix-zero-divide-i…
mzabaluev Jul 11, 2024
8cb4c1b
feat(vm-genesis): allow zero reward percentage
mzabaluev Jul 11, 2024
413baad
refactor: APT to MOVE
andyjsbell Jul 7, 2024
c9453c4
Update init endpoints to Suzuka testnet and Imola devnet
Jul 11, 2024
381add1
Need Primata's input on explorer URLs
Jul 11, 2024
acbe23c
fix(aptos-db): reorder reset on revert
mzabaluev Jul 15, 2024
79233a2
Merge pull request #47 from movementlabsxyz/andyjsbell/native-move-ch…
l-monninger Jul 15, 2024
ac5a80f
Merge pull request #45 from movementlabsxyz/mikhail/fix-zero-divide-i…
l-monninger Jul 15, 2024
b2f58ea
Merge pull request #46 from movementlabsxyz/andygolay/movement-cli-in…
l-monninger Jul 15, 2024
9d380ff
Change Aptos to Movement in a couple spots for CLI
Jul 16, 2024
719ee3b
apparent typo fix
Jul 16, 2024
1e7a4bf
apparent typo fix
Jul 16, 2024
87b7ef2
Updated output directory to be .movement
Jul 17, 2024
bebbb20
test(aptos-db): improve revert tests
mzabaluev Jul 18, 2024
1893b47
fix: commit stash.
l-monninger Jul 18, 2024
cc8bfff
Merge pull request #28 from movementlabsxyz/mikhail/revert-commit-fix…
l-monninger Jul 18, 2024
7d117d7
Merge pull request #49 from movementlabsxyz/andygolay/movement-cli-in…
l-monninger Jul 18, 2024
14414ed
Merge branch 'movement' of github.com:movementlabsxyz/aptos-core into…
l-monninger Jul 19, 2024
c590321
fix: update visibility.
l-monninger Jul 21, 2024
8e1a3a1
feat(storage-interface): getter for FinalityView
mzabaluev Jul 30, 2024
51d875c
Merge pull request #51 from movementlabsxyz/l-monninger/suzuka-servic…
l-monninger Aug 2, 2024
1c63a73
Merge pull request #52 from movementlabsxyz/mikhail/finalized-block-h…
mzabaluev Aug 6, 2024
338f9a1
Remove unwrap and panic on Tx writeset missing (#53)
musitdev Aug 7, 2024
a1d3baa
chore: clean up .github/workflows
mzabaluev Aug 7, 2024
185b4fb
Merge pull request #58 from movementlabsxyz/mikhail/remove-upstream-w…
andygolay Aug 7, 2024
0cee12a
feat: atomic bridge implementation
andyjsbell Aug 27, 2024
45ee7d3
fix: redirect to --skip-faucet and link to faucet ui
andygolay Aug 27, 2024
89ffadf
fix: delete .movement/config.yaml
andygolay Aug 27, 2024
c9d4c2d
remove panic in write_set_change grpc convertion
musitdev Aug 29, 2024
8daa935
remove panic in write_set_change grpc convertion (#63)
musitdev Aug 29, 2024
eea047d
test: e2e tests for initiator and counterparty
andyjsbell Sep 4, 2024
5c72408
feat: atomic bridge included in genesis initialization
andyjsbell Sep 4, 2024
3da1e8e
Remove problematic testnet interruption
andygolay Sep 4, 2024
93e0d84
fix: return testnet error after let network block
andygolay Sep 6, 2024
a6ca46d
Merge pull request #61 from movementlabsxyz/andygolay/cli-faucet-link
mzabaluev Sep 6, 2024
0546b34
Fix error return format in init.rs
andygolay Sep 7, 2024
481786d
Update crates/aptos/src/common/init.rs
andygolay Sep 7, 2024
6d2ec93
Merge pull request #65 from movementlabsxyz/andygolay-cli-testnet-ini…
mzabaluev Sep 9, 2024
7f6b3a8
fix(types): break lock reentrancy in StateKey
mzabaluev Sep 18, 2024
2361824
Merge pull request #66 from movementlabsxyz/musitdev/remove_panic_in_…
mzabaluev Sep 18, 2024
1d59009
Merge pull request #67 from movementlabsxyz/mikhail/fix-lock-reentran…
mzabaluev Sep 20, 2024
544ddad
fix: open to all complete on counterparty
andyjsbell Sep 24, 2024
c28050c
fix: update transfer lock event name and member
andyjsbell Sep 24, 2024
6a8300c
fix: simplify data struct
andyjsbell Sep 24, 2024
16b21fa
fix: update spec for new data structure
andyjsbell Sep 24, 2024
16daa38
fix: fixed time lock durations
andyjsbell Sep 25, 2024
e70d8eb
fix: simplify generics
andyjsbell Sep 25, 2024
d9e36dc
fix: configurable time locks
andyjsbell Sep 25, 2024
8d3291e
fix: update build types
andyjsbell Sep 25, 2024
f4594a1
feat: documentation
andyjsbell Sep 25, 2024
c6ae37a
feat: gate setting time locks
andyjsbell Sep 25, 2024
81c1aaa
fix: update documentation
andyjsbell Sep 26, 2024
12d69ea
fix: assert on timelock for cancel and complete
andyjsbell Sep 26, 2024
70980b6
fix: remove unneccesary test initialisation
andyjsbell Sep 26, 2024
9c0fd90
refactor: module names prefix atomic
andyjsbell Sep 26, 2024
3cba621
fix: update spec for extra timelock check
andyjsbell Sep 26, 2024
9355936
fix: update docs and build
andyjsbell Sep 26, 2024
d4e665b
fix: e2e tests for operator update
andyjsbell Sep 26, 2024
d76b853
feat: e2e tests for configurable time lock
andyjsbell Sep 26, 2024
0c00c67
fix: reduce visibility
andyjsbell Sep 26, 2024
0a2e007
feat: feature flag atomic bridge
andyjsbell Sep 26, 2024
0611551
feat: piggyback transaction_fee for caps instead of genesis
andyjsbell Sep 30, 2024
fb0ef3f
Merge pull request #72 from movementlabsxyz/andyjsbell/atomic-bridge
0xmovses Sep 30, 2024
e5d7832
feat(aptosdb): patch pruner logs to use tracing
mzabaluev Oct 2, 2024
70be392
Merge pull request #79 from movementlabsxyz/mikhail/patch-pruner-logging
l-monninger Oct 2, 2024
620db44
add get_bridge_transfer_details view function
andygolay Oct 13, 2024
1284b8c
fix: separate get_bridge_transfer_details_initiator and counterparty …
andygolay Oct 14, 2024
3f0c536
fix: remove duplicate create_time_lock
andygolay Oct 15, 2024
7037030
feat: move unit tests added for bridge transfer details view functions
andygolay Oct 15, 2024
1831c95
Merge pull request #83 from movementlabsxyz/andygolay/get_bridge_tran…
0xmovses Oct 15, 2024
38a35e5
Revert "Merge pull request #83 from movementlabsxyz/andygolay/get_bri…
0xmovses Oct 15, 2024
def973c
initial commit
andygolay Oct 15, 2024
c3a1051
fix: include counterparty timelock duration fix
andygolay Oct 15, 2024
79960aa
feat: get_bridge_transfer_details function refactor
andygolay Oct 15, 2024
c1ecd0a
feat: documentation for get bridge transfer details view functions
andygolay Oct 15, 2024
7a0e210
Merge pull request #85 from movementlabsxyz/andygolay/details-view-fu…
andyjsbell Oct 16, 2024
464ece1
feat: remove unneeded eip-55 check in bridge counterparty lock call
andygolay Oct 21, 2024
22d717f
test: in process of getting unit tests to pass, EventHandles in place
andygolay Oct 21, 2024
c50e964
test: all move unit tests pass, two failing e2e move tests
andygolay Oct 21, 2024
53d06f3
feat: update names of event container struct fields
andygolay Oct 21, 2024
81c69d8
test: add initiator and counterparty initialize functions to genesis
andygolay Oct 22, 2024
62c3377
feat: all E2E Move tests passing
andygolay Oct 22, 2024
6a201a1
fix: clean up Move warnings in atomic_bridge.move
andygolay Oct 22, 2024
d9859a6
test: remove EIP 55 check in initiate_bridge_transfer for testing pur…
andygolay Oct 23, 2024
4bdf799
fix: abort if feature flag is off
andyjsbell Nov 7, 2024
a356f71
Merge pull request #93 from movementlabsxyz/andyjsbell/spec_for_atomi…
andyjsbell Nov 11, 2024
50ebdd6
fix: explicitly disable atomic bridge feature
andyjsbell Nov 11, 2024
1e3d3db
deps: bump for diesel 2.2 and diesel-async 0.5
mzabaluev Nov 12, 2024
2be8941
Merge pull request #97 from movementlabsxyz/mikhail/diesel-2.2
mzabaluev Nov 13, 2024
ad1f02a
Merge pull request #96 from movementlabsxyz/andyjsbell/fix_test_copy_…
andyjsbell Nov 14, 2024
4383952
Merge remote-tracking branch 'origin/movement' into andygolay/remove-…
andygolay Nov 18, 2024
89db96f
feat: add check for nonzero 40 char hex string
andygolay Nov 18, 2024
ec734b5
fix: gitignore boogie.bpl
andygolay Nov 18, 2024
5e13d66
fix: delete boogie.bpl
andygolay Nov 18, 2024
e0e0454
Remove println
andygolay Nov 18, 2024
9dfc8e7
Merge pull request #87 from movementlabsxyz/andygolay/remove-eip-55-f…
l-monninger Nov 18, 2024
b964bf8
initial commit, unit tests pass but simplified functions still need t…
andygolay Nov 18, 2024
9173dda
feat: test_initiate_brige_transfer_simplified Move unit test passes
andygolay Nov 18, 2024
7f802da
feat: initiate and complete unit tests pass; need to check input para…
andygolay Nov 18, 2024
56d727f
test: add parameter check, test_complete_bridge_transfer_simplified f…
andygolay Nov 18, 2024
a47a383
feat: test_initiate_bridge_transfer_simplified and test_complete_brid…
andygolay Nov 19, 2024
bf85364
feat: add e2e move tests test_initiate_transfer_simplified test_compl…
andygolay Nov 19, 2024
e8b8ca7
add native bridge
Primata Nov 19, 2024
8f57889
readd atomic bridge
Primata Nov 19, 2024
ea9ba3b
fix: compiles but multiple unit tests fail
andygolay Nov 20, 2024
38ca862
fix: test_complete_bridge_transfer and test_complete_bridge_transfer_…
andygolay Nov 20, 2024
dfa049f
test: add set_nonce_to_bridge_transfer_id into initiate_bridge_transfer
andygolay Nov 20, 2024
92f5dda
feat: all move unit tests pass, initiate happy path test added
andygolay Nov 20, 2024
8739e2d
fix: remove conflicting Nonce struct from native_bridge_store
andygolay Nov 20, 2024
e05e519
fix: restore atomic_bridge.move and e2e tests from movement branch
andygolay Nov 20, 2024
67d6b30
feat: add Rust E2E test test_native_bridge_initiate and initiate nati…
andygolay Nov 20, 2024
4e6eb34
feat: check for existing incoming nonce and add incoming nonce to tab…
andygolay Nov 20, 2024
ff34661
tiny changes
Primata Nov 20, 2024
97a965c
add native bridge.spec
Primata Nov 20, 2024
4b0d752
update: change operator to relayer, comment out spec for now
andygolay Nov 20, 2024
3afb59e
fix: map nonce to details rather than to bridge transfer ID
andygolay Nov 20, 2024
99e244d
clean: remove more unneeded code from the atomic_bridge model
andygolay Nov 20, 2024
21f6273
clean: more cleanup of unneeded functions and code
andygolay Nov 20, 2024
5b92fc3
feat: updated OutboundTransfer struct
andygolay Nov 20, 2024
3b91758
feat: increase spec converage (compiles but doesn't pass aptos move p…
andygolay Nov 20, 2024
6d2f6b2
clean: integrate more review feedback, clean up move warnings
andygolay Nov 21, 2024
fa9f056
rename: incoming -> inbound
andygolay Nov 21, 2024
ed39adb
Update aptos-move/framework/aptos-framework/sources/native_bridge.move
andygolay Nov 21, 2024
111a554
Merge pull request #100 from movementlabsxyz/andygolay/simplified-bridge
andygolay Nov 21, 2024
e7c3e0a
feat: sponsored transactions.
l-monninger Nov 22, 2024
a965405
fix: tests.
l-monninger Nov 22, 2024
69feea3
fix: revert.
l-monninger Nov 22, 2024
beafb1f
Merge pull request #103 from movementlabsxyz/l-monninger/revert
l-monninger Nov 22, 2024
06cab6d
initial commit
andygolay Nov 29, 2024
22c1158
fix: remove bcs serialization from vector<u8>, make test_native_bridg…
andygolay Dec 1, 2024
b558fd8
fix: remove debug prints
andygolay Dec 1, 2024
daddc50
feat: make bridge transfer ID on Move side equal bridge transfer ID f…
andygolay Dec 2, 2024
c8051ad
fix: initiate_bridge_transfer serializes params the same way as the E…
andygolay Dec 2, 2024
30d16b5
fix: better assertions and logging in test_initiate and test_complete…
andygolay Dec 2, 2024
7c0449e
feat: test_native_bridge_initiate E2E Move test passes and produces t…
andygolay Dec 2, 2024
b6e6168
feat: E2E Move tests pass, ready for review. Will leave debugging in …
andygolay Dec 2, 2024
1745fb3
fix: removed unused functions
andygolay Dec 2, 2024
4947a1c
fix: remove Rust println and Move debug
andygolay Dec 2, 2024
0da24a0
fix: update docs and remove debug import
andygolay Dec 2, 2024
903d4b3
Merge pull request #105 from movementlabsxyz/andygolay/no-bcs-for-vecu8
0xmovses Dec 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
initial commit
andygolay committed Nov 29, 2024

Verified

This commit was signed with the committer’s verified signature.
fmalcher Ferdinand Malcher
commit 06cab6dfdae581f8a66f534ff92c3bdaeb45867f
17 changes: 15 additions & 2 deletions aptos-move/framework/aptos-framework/sources/native_bridge.move
Original file line number Diff line number Diff line change
@@ -15,6 +15,8 @@ module aptos_framework::native_bridge {
use std::bcs;
use std::vector;
use aptos_std::aptos_hash::keccak256;
#[test_only]
use aptos_std::debug;

const ETRANSFER_ALREADY_PROCESSED: u64 = 1;
const EINVALID_BRIDGE_TRANSFER_ID: u64 = 2;
@@ -159,7 +161,7 @@ module aptos_framework::native_bridge {

// Validate the bridge_transfer_id by reconstructing the hash
let combined_bytes = vector::empty<u8>();
vector::append(&mut combined_bytes, bcs::to_bytes(&initiator));
vector::append(&mut combined_bytes, initiator);
vector::append(&mut combined_bytes, bcs::to_bytes(&recipient));
vector::append(&mut combined_bytes, bcs::to_bytes(&amount));
vector::append(&mut combined_bytes, bcs::to_bytes(&nonce));
@@ -250,12 +252,23 @@ module aptos_framework::native_bridge {

// Create a bridge transfer ID algorithmically
let combined_bytes = vector::empty<u8>();
vector::append(&mut combined_bytes, bcs::to_bytes(&initiator));
vector::append(&mut combined_bytes, initiator);
vector::append(&mut combined_bytes, bcs::to_bytes(&recipient));
vector::append(&mut combined_bytes, bcs::to_bytes(&amount));
vector::append(&mut combined_bytes, bcs::to_bytes(&nonce));
let bridge_transfer_id = keccak256(combined_bytes);

debug::print(&initiator);
debug::print(&recipient);
debug::print(&amount);
debug::print(&nonce);

debug::print(&bcs::to_bytes(&recipient));
debug::print(&bcs::to_bytes(&amount));
debug::print(&bcs::to_bytes(&nonce));

debug::print(&bridge_transfer_id);

// Create an account for our recipient
aptos_account::create_account(recipient);