Contracts V3 #882

vgeddes · 2023-07-15T21:58:39Z

Several major changes:

Instead of a dozen contracts managing their own state, the bridge is now centred around a single contract design: Gateway.sol.
Agent contracts for Polkadot parachains as discussed with Parity
I've switched over to the proxy upgrade pattern, and using a special technique to implement upgradable storage.

All in all, I think this is a major improvement over the old code. There's less code, and its easier to reason about.

core/packages/contracts/src/DeployScript.sol

musnit · 2023-07-17T09:32:29Z

core/packages/contracts/src/storage/CoreStorage.sol

+ ParaID bridgeHubParaID;
+ }
+
+ bytes32 internal constant SLOT = keccak256("org.snowbridge.storage.core");


should b versioned?

core/packages/contracts/src/AgentExecutor.sol

musnit · 2023-07-17T11:51:05Z

core/packages/contracts/src/storage/CoreStorage.sol

+ // Operating mode:
+ OperatingMode mode;
+ // Message channels
+ mapping(ParaID paraID => Channel) channels;


as discussed, maybe make this mapping from an agentId instead of paraId?

I don't think there's enough time before the audit to properly spec the change and implement it.

core/packages/contracts/src/Gateway.sol

codecov · 2023-07-17T22:09:54Z

Codecov Report

Patch coverage: 60.61% and project coverage change: +4.92% 🎉

Comparison is base (3c4bec4) 69.80% compared to head (2019277) 74.72%.

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #882      +/-   ##
==========================================
+ Coverage   69.80%   74.72%   +4.92%     
==========================================
  Files          47       40       -7     
  Lines        1679     1737      +58     
  Branches       58       74      +16     
==========================================
+ Hits         1172     1298     +126     
+ Misses        489      419      -70     
- Partials       18       20       +2

Flag	Coverage Δ
rust	`75.17% <49.33%> (+4.99%)`	⬆️
solidity	`72.88% <71.73%> (+5.18%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed	Coverage Δ
parachain/pallets/control/src/weights.rs	`0.00% <0.00%> (ø)`
parachain/primitives/core/src/outbound.rs	`16.92% <16.92%> (ø)`
parachain/primitives/router/src/inbound/mod.rs	`48.59% <21.42%> (+41.45%)`	⬆️
contracts/src/Verification.sol	`52.94% <52.94%> (ø)`
parachain/pallets/control/src/lib.rs	`64.70% <64.51%> (+64.70%)`	⬆️
contracts/src/Assets.sol	`67.85% <67.85%> (ø)`
contracts/src/Gateway.sol	`73.28% <73.28%> (ø)`
parachain/pallets/inbound-queue/src/lib.rs	`65.95% <77.77%> (+9.61%)`	⬆️
contracts/src/BeefyClient.sol	`75.42% <80.00%> (ø)`
parachain/primitives/router/src/outbound/mod.rs	`87.96% <85.00%> (-2.80%)`	⬇️
... and 9 more

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

core/packages/contracts/src/Gateway.sol

core/packages/contracts/src/IGateway.sol

core/packages/contracts/src/Gateway.sol

core/packages/contracts/src/GatewayProxy.sol

doubledup · 2023-07-18T15:13:16Z

core/packages/contracts/src/Types.sol

@@ -2,18 +2,36 @@
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 pragma solidity 0.8.20;

-type ParaID is uint32;
+type ParaID is uint256;


Is this type correct? ParaId is still a u32 in the parachain:

snowbridge/parachain/primitives/core/src/lib.rs

Line 21 in a99fc50

pub use polkadot_parachain::primitives::Id as ParaId;

(resolves to this: https://github.com/paritytech/polkadot/blob/6a71a7ef7/parachain/src/primitives.rs#L154)

parachain/pallets/control/src/mock.rs

parachain/pallets/control/src/lib.rs

* Upgrade ssz_rs crate. (#880) * Upgrade ssz_rs crate. * Upgrade ssz_rs crate. --------- Co-authored-by: claravanstaden <Cats 4 life!> * Bump nixpkgs to use its geth package (#885) * Bump nixpkgs to use its geth package * Use source config in PolkadotListener * Match field order in struct def * Move info log to relay creation * Remove unused channel * Whitespace * Add context to errors * Add logs * Bump node & pnpm in workflow * Rename locals * Remove unused variable * Add Troubleshooting README section * Fix up .envrc-example files * Add note about pure shells * Update cumulus submodule (#886) * Inbound queue benchmarks (#876) * Start with inbound channel benchmarks. * Add method to set execution header storage for benchmark test. * Working on benchmarks * Basic working version * Cleanup * Removes cleanup. * Adds some comments for Alistair. * Adds branch name. * Makes note * Test transactions * Cleaning up beacon client deps. * Clean up comments. * Tests cleanup. * Fixes non-benchmark test runs. * Cleanup. * Update fixtures and generates benchmarks. * Revert relayer logs. * Cleanup BenchmarkHelper impl and inbound queue dependencies. * fmt * Cleanup imports. * Cleanup imports. * Touch * Adds weights in inbound queue pallet. * Fix tests. * Update cumulus. --------- Co-authored-by: claravanstaden <Cats 4 life!> * Fix parachain build * Move BalanceOf outside of pallet * remove benchmark for non existing method * downgrade cargo.lock to match cumulus * fix benchmarks --------- Co-authored-by: Clara van Staden <claravanstaden64@gmail.com> Co-authored-by: Alistair Singh <alistair.singh7@gmail.com>

v4.9.2

* Halting & resuming bridge pallets * Ignore .env * Remove .env * Some polish * Set owner of bridge pallets * Upgrade ssz_rs crate. (#880) * Upgrade ssz_rs crate. * Upgrade ssz_rs crate. --------- Co-authored-by: claravanstaden <Cats 4 life!> * Update cumulus * Bump nixpkgs to use its geth package (#885) * Bump nixpkgs to use its geth package * Use source config in PolkadotListener * Match field order in struct def * Move info log to relay creation * Remove unused channel * Whitespace * Add context to errors * Add logs * Bump node & pnpm in workflow * Rename locals * Remove unused variable * Add Troubleshooting README section * Fix up .envrc-example files * Add note about pure shells * Relax RANDAO_COMMIT_DELAY for local setup * Update cumulus * Update cumulus submodule (#886) * Update cumulus * Inbound queue benchmarks (#876) * Start with inbound channel benchmarks. * Add method to set execution header storage for benchmark test. * Working on benchmarks * Basic working version * Cleanup * Removes cleanup. * Adds some comments for Alistair. * Adds branch name. * Makes note * Test transactions * Cleaning up beacon client deps. * Clean up comments. * Tests cleanup. * Fixes non-benchmark test runs. * Cleanup. * Update fixtures and generates benchmarks. * Revert relayer logs. * Cleanup BenchmarkHelper impl and inbound queue dependencies. * fmt * Cleanup imports. * Cleanup imports. * Touch * Adds weights in inbound queue pallet. * Fix tests. * Update cumulus. --------- Co-authored-by: claravanstaden <Cats 4 life!> * Fix test * Fix parachain build * Move BalanceOf outside of pallet * remove benchmark for non existing method * downgrade cargo.lock to match cumulus * fix benchmarks * Clara/sno 552 (#887) * Spacing * Spacing * Undo typo. * Minor updates. * Adds comment about IrrelevantUpdate. * One more comment. * Update error name. --------- Co-authored-by: claravanstaden <Cats 4 life!> * Halting & resuming bridge pallets (#883) * Halting & resuming bridge pallets * Ignore .env * Remove .env * Some polish * Set owner of bridge pallets * Update cumulus * Relax RANDAO_COMMIT_DELAY for local setup * Update cumulus * Update cumulus * Fix test * Fix Warnings * Fix test * Fix build & format * Fix benchmark test * Check for duplicate versions of substrate and polkadot (#891) * modified pre-commit * fixes * testing * testing * testing * fixed tests * Format * Some fix * Update cumulus * Update cumulus --------- Co-authored-by: Clara van Staden <claravanstaden64@gmail.com> Co-authored-by: David Dunn <26876072+doubledup@users.noreply.github.com> Co-authored-by: Alistair Singh <alistair.singh7@gmail.com>

* initial * added tests * handle local accounts and pallets

parachain/primitives/router/src/outbound/mod.rs

* Catching customized error reverted in solidity * Fix building error * Improve error log * Revert "Fix building error" This reverts commit 5dc75e0. * Some polish

core/packages/contracts/test/Gateway.t.sol

* Update inbound queue benchmarks. * Update inbound queue benchmarks. * Simplify code. * Fix benchmark test. * Updates cumulus. * Cleans up test. --------- Co-authored-by: claravanstaden <Cats 4 life!>

* Improve Beefy tests * Update gas snapshot * Split test fixture * Update snapshot * Decode mmr leaf from commitment file * Regenerate final bitField * Update foundry remove ffi * Update test remove hardcode check

* Check vset len on ticket against relevant vset len * Order methods by expected use * Sort errors * Add mocked tests * Add comments about zero-value tickets * Move helpers back * Swap final length checks for initial id checks * Fix handover stale commitment test

* update gateway to registry * fixed test * fmt * make agents relative to the relaychain * use address(this) * fmt * log out reciept and drop sent amount * update cumulus * use real agent ids * create agents on initialize * Revert "create agents on initialize" This reverts commit e53557d. * update agents and fix abi encode * encode with enum * fmt * update cumulus * fix encoding * fix tests * update cumulus * rustfmt * remove duplicate enum * generate bindings * remove tuple * use framebenchmarking v2 * updated cumulus

* Improve documentation of code comments * Refactor snowbridge-core crate * Add more comments * Add final newline

* Make core/contracts js independent * Clean dependencies * More cleanup * Fix ci * remove submodules * move contracts dir * foo * forge install: forge-std v1.6.0 * forge install: openzeppelin-contracts v4.9.2 * forge install: ds-test * forge install: canonical-weth * Move contracts dir * improve contract-types package * rename * refacta * foo * update docs * fixes * foo * fix imports --------- Co-authored-by: Vincent Geddes <vincent.geddes@hey.com>

alistair-singh

🚀

vgeddes added 4 commits July 2, 2023 16:54

first commit

f27654c

foo

c2b230e

add more tests

7f6f8ff

fix solhint

77c2c54

vgeddes requested review from claravanstaden, alistair-singh, yrong and doubledup July 15, 2023 21:58

vgeddes added 2 commits July 16, 2023 09:56

Merge branch 'main' into proxy-contracts

e3ceb3a

fix merge conflict

68473a7

yrong reviewed Jul 17, 2023

View reviewed changes

core/packages/contracts/src/DeployScript.sol Outdated Show resolved Hide resolved

musnit reviewed Jul 17, 2023

View reviewed changes

yrong reviewed Jul 17, 2023

View reviewed changes

core/packages/contracts/src/AgentExecutor.sol Outdated Show resolved Hide resolved

musnit reviewed Jul 17, 2023

View reviewed changes

yrong reviewed Jul 17, 2023

View reviewed changes

core/packages/contracts/src/Gateway.sol Outdated Show resolved Hide resolved

Improve contracts

f06691c

doubledup reviewed Jul 18, 2023

View reviewed changes

core/packages/contracts/src/Gateway.sol Outdated Show resolved Hide resolved

doubledup reviewed Jul 18, 2023

View reviewed changes

core/packages/contracts/src/IGateway.sol Outdated Show resolved Hide resolved

alistair-singh reviewed Jul 18, 2023

View reviewed changes

core/packages/contracts/src/Gateway.sol Outdated Show resolved Hide resolved

core/packages/contracts/src/GatewayProxy.sol Outdated Show resolved Hide resolved

doubledup reviewed Jul 18, 2023

View reviewed changes

alistair-singh reviewed Jul 18, 2023

View reviewed changes

parachain/pallets/control/src/mock.rs Outdated Show resolved Hide resolved

parachain/pallets/control/src/lib.rs Outdated Show resolved Hide resolved

vgeddes and others added 8 commits July 18, 2023 22:54

More improvements to contracts

6d44b0d

add more unit test coverage

d815bf4

Improve mmr proof test

2a9f2b0

rename contract

d053333

forge install: openzeppelin-contracts

b0fe1b8

v4.9.2

fix gitmodules

a9df610

vgeddes and others added 4 commits July 23, 2023 13:31

improve API for sending tokens

3c1e87a

Create Agent (#899)

23ec37c

* initial * added tests * handle local accounts and pallets

update cumulus

978e201

improve pallets

9700fc5

yrong reviewed Jul 24, 2023

View reviewed changes

parachain/primitives/router/src/outbound/mod.rs Show resolved Hide resolved

claravanstaden mentioned this pull request Jul 24, 2023

Contracts V3 Snowfork/cumulus#50

Merged

doubledup mentioned this pull request Jul 24, 2023

Add set_gateway to safe call filter Snowfork/cumulus#49

Merged

doubledup and others added 7 commits July 24, 2023 16:43

Update cumulus: add set_gateway to safe call filter

5f14f5f

Update cumulus.

6302ee6

Update bindings in smoketests

2ba5dba

Fix golang nonsense

50ea024

Handle customized error (#900)

a2c96f8

* Catching customized error reverted in solidity * Fix building error * Improve error log * Revert "Fix building error" This reverts commit 5dc75e0. * Some polish

fix gopath

3627bb6

fix unbound vars error in scripts

a6d19c9

alistair-singh reviewed Jul 25, 2023

View reviewed changes

core/packages/contracts/test/Gateway.t.sol Outdated Show resolved Hide resolved

claravanstaden and others added 9 commits July 26, 2023 09:46

Update inbound queue benchmarks. (#902)

eaa9eee

* Update inbound queue benchmarks. * Update inbound queue benchmarks. * Simplify code. * Fix benchmark test. * Updates cumulus. * Cleans up test. --------- Co-authored-by: claravanstaden <Cats 4 life!>

remove duplicate openzeppelin submodule

686135a

Improve beefy tests (#901)

d425a58

* Improve Beefy tests * Update gas snapshot * Split test fixture * Update snapshot * Decode mmr leaf from commitment file * Regenerate final bitField * Update foundry remove ffi * Update test remove hardcode check

Fix execution relay (#905)

996469a

Add more documentation in contracts (#908)

d471559

* Improve documentation of code comments * Refactor snowbridge-core crate * Add more comments * Add final newline

Merge branch 'main' into proxy-contracts

4cff185

alistair-singh approved these changes Jul 29, 2023

View reviewed changes

more tweaks to dev env

2019277

vgeddes merged commit 30d0f0a into main Jul 30, 2023
5 checks passed

vgeddes deleted the proxy-contracts branch July 30, 2023 13:35

vgeddes restored the proxy-contracts branch July 30, 2023 13:35

yrong mentioned this pull request Aug 3, 2023

Complete Control Pallet Implementation #917

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Contracts V3 #882

Contracts V3 #882

vgeddes commented Jul 15, 2023 •

edited

Loading

musnit Jul 17, 2023

musnit Jul 17, 2023

vgeddes Jul 20, 2023

codecov bot commented Jul 17, 2023 •

edited

Loading

doubledup Jul 18, 2023

doubledup Jul 18, 2023

alistair-singh left a comment

Contracts V3 #882

Contracts V3 #882

Conversation

vgeddes commented Jul 15, 2023 • edited Loading

musnit Jul 17, 2023

Choose a reason for hiding this comment

musnit Jul 17, 2023

Choose a reason for hiding this comment

vgeddes Jul 20, 2023

Choose a reason for hiding this comment

codecov bot commented Jul 17, 2023 • edited Loading

Codecov Report

doubledup Jul 18, 2023

Choose a reason for hiding this comment

doubledup Jul 18, 2023

Choose a reason for hiding this comment

alistair-singh left a comment

Choose a reason for hiding this comment

vgeddes commented Jul 15, 2023 •

edited

Loading

codecov bot commented Jul 17, 2023 •

edited

Loading