sno-472 rebased #890

yrong · 2023-07-19T11:28:03Z

* Upgrade ssz_rs crate. * Upgrade ssz_rs crate. --------- Co-authored-by: claravanstaden <Cats 4 life!>

* 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

* 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!>

* Spacing * Spacing * Undo typo. * Minor updates. * Adds comment about IrrelevantUpdate. * One more comment. * Update error name. --------- Co-authored-by: claravanstaden <Cats 4 life!>

…ormat

* 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

codecov · 2023-07-19T11:33:08Z

Codecov Report

❗ No coverage uploaded for pull request base (proxy-contracts@2a9f2b0). Click here to learn what that means.
Patch has no changes to coverable lines.

Additional details and impacted files

@@                Coverage Diff                 @@
##             proxy-contracts     #890   +/-   ##
==================================================
  Coverage                   ?   66.33%           
==================================================
  Files                      ?       43           
  Lines                      ?     1732           
  Branches                   ?       70           
==================================================
  Hits                       ?     1149           
  Misses                     ?      564           
  Partials                   ?       19

Flag	Coverage Δ
rust	`65.11% <0.00%> (?)`
solidity	`71.47% <0.00%> (?)`

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

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

yrong · 2023-07-19T11:38:27Z

@doubledup I've merged #883 into main branch. As Vincent suggest here rebase to your fix in #889 and hope it will save you some time.

doubledup · 2023-07-19T13:01:17Z

ah damn, I just merged that branch and that seems to have caused a mess here, sorry. This should be fine if you drop the merge commit here from david/fix-parachain-build and do one more merge from proxy-contracts.

yrong · 2023-07-19T15:07:47Z

@doubledup @vgeddes I've rebased code from proxy-contracts, recent change also include some fix for tests so to make CI back to work.

parachain/pallets/inbound-queue/Cargo.toml

doubledup · 2023-07-19T14:55:27Z

parachain/pallets/outbound-queue/src/lib.rs

@@ -272,6 +316,7 @@ pub mod pallet {
 		}

 		fn submit(ticket: Self::Ticket) -> Result<(), SubmitError> {
+			Self::ensure_not_halted().map_err(|_| SubmitError::BridgeHalted)?;


Let's make this wrap the OwnedBridgeModuleError like the errors in the other pallets, so callers keep that context.

This is a trait method which expect SubmitError here.

I meant adding the OwnedBridgeModuleError to the SubmitError, like this:

Suggested change

Self::ensure_not_halted().map_err(|_| SubmitError::BridgeHalted)?;

Self::ensure_not_halted().map_err(|e| SubmitError::BridgeHalted(e))?;

parachain/pallets/control/src/benchmarking.rs

parachain/pallets/inbound-queue/src/test.rs

core/packages/test/scripts/set-env.sh

core/packages/test/scripts/configure-bridgehub.sh

* modified pre-commit * fixes * testing * testing * testing

* 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>

* Improve contracts * More improvements to contracts * Fix parachain build in proxy-contracts branch (#889) * 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> * forge install: openzeppelin-contracts v4.9.2 * sno-472 rebased (#890) * 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> * Proxy contracts Tests fixes (#892) * fixed tests * warnings and imports * rustfmt * updated cumulus * Revert rustfmt (#896) * Revert "rustfmt" This reverts commit b83cec7. * reverted xcm-builder * Create agent (#895) * base * removed location conversion * completed implementation * remove xcm-builder * update cumulus * update cumulus * use contains_key * Fix openzeppelin-contracts submodule --------- Co-authored-by: David Dunn <26876072+doubledup@users.noreply.github.com> * improve API for sending tokens * Messy working version. * Cleanup. * More cleanup. * Rollback unnecessary changes. * Cleanup whitespace. * Fix tests. * Fuzz the submit method. * Revert rebase oopsies. * More fuzzing. * More fuzzing. * Last extrinsic. * Remove unnecessary dependency. * Revert readme. * Fix tests and feature issues. * Cleanup types. * More cleanup. * Call extrinsics directly. Adds readme. * Adds CI. * cd to correct dir * Update CI. * Correct nightly param. * Remove runs. * Own impl for SyncCommittee. * Remove rng. Cleans up workflow. * Last cleanup. * Update parachain/pallets/ethereum-beacon-client/fuzz/Cargo.toml Co-authored-by: David Dunn <26876072+doubledup@users.noreply.github.com> * Adds cargo-fuzz to init script. * PR comment changes. * Update parachain/pallets/ethereum-beacon-client/fuzz/src/impls.rs Co-authored-by: David Dunn <26876072+doubledup@users.noreply.github.com> * Update rust-toolchain.toml Co-authored-by: David Dunn <26876072+doubledup@users.noreply.github.com> * Update .github/workflows/parachain.yml Co-authored-by: David Dunn <26876072+doubledup@users.noreply.github.com> * Less runs for shorter Github actions. --------- Co-authored-by: Vincent Geddes <vincent.geddes@hey.com> Co-authored-by: David Dunn <26876072+doubledup@users.noreply.github.com> Co-authored-by: Alistair Singh <alistair.singh7@gmail.com> Co-authored-by: Ron <yrong1997@gmail.com> Co-authored-by: claravanstaden <Cats 4 life!>

yrong and others added 27 commits July 17, 2023 10:49

Halting & resuming bridge pallets

ea9406f

Ignore .env

2d403cb

Remove .env

b27f236

Some polish

146a109

Set owner of bridge pallets

4f83b6a

Upgrade ssz_rs crate. (#880)

a9d3df4

* Upgrade ssz_rs crate. * Upgrade ssz_rs crate. --------- Co-authored-by: claravanstaden <Cats 4 life!>

Merge branch 'main' into ron/sno-472

ae3fc7d

Update cumulus

a70c47e

Relax RANDAO_COMMIT_DELAY for local setup

724637f

Update cumulus

a8569bb

Update cumulus submodule (#886)

4947f1e

Update cumulus

56c4f00

Merge branch 'main' into ron/sno-472

c644a53

Merge branch 'main' into ron/sno-472

d6bbaba

Fix test

7129742

Merge branch 'main' into fix

c98ad0d

Fix parachain build

8f7befa

Move BalanceOf outside of pallet

c10c850

Merge branch 'proxy-contracts' into david/fix-parachain-build

d560b90

remove benchmark for non existing method

d599852

downgrade cargo.lock to match cumulus

5e8762e

fix benchmarks

6ba8248

Clara/sno 552 (#887)

5e25cd0

* Spacing * Spacing * Undo typo. * Minor updates. * Adds comment about IrrelevantUpdate. * One more comment. * Update error name. --------- Co-authored-by: claravanstaden <Cats 4 life!>

Merge branch 'proxy-contracts' into ron/sno-472-rebased

c17a3ac

Merge branch 'david/fix-parachain-build' into ron/sno-472-rebased & f…

3e60df3

…ormat

yrong requested a review from doubledup July 19, 2023 11:28

Halting & resuming bridge pallets (#883)

4950e80

* 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

yrong requested a review from vgeddes July 19, 2023 11:32

vgeddes approved these changes Jul 19, 2023

View reviewed changes

Base automatically changed from david/fix-parachain-build to proxy-contracts July 19, 2023 12:46

yrong added 5 commits July 19, 2023 21:43

Merge branch 'proxy-contracts' into ron/sno-472-rebased

01bea7c

Fix Warnings

f7944b7

Fix test

ff30771

Fix build & format

3e259d3

Fix benchmark test

792fbbf

alistair-singh approved these changes Jul 19, 2023

View reviewed changes

doubledup approved these changes Jul 19, 2023

View reviewed changes

alistair-singh added 2 commits July 19, 2023 19:50

Check for duplicate versions of substrate and polkadot (#891)

c1ff60a

* modified pre-commit * fixes * testing * testing * testing

fixed tests

ad9d35c

alistair-singh mentioned this pull request Jul 19, 2023

Proxy contracts Tests fixes #892

Merged

yrong added 6 commits July 20, 2023 09:40

Merge branch 'alistair/proxy-contracts-tests' into ron/sno-472-rebased

df433f7

Format

a3004c0

Merge branch 'main' into ron/sno-472-rebased

e3401cf

Some fix

17052d3

Update cumulus

4ecf272

Update cumulus

3336a9e

yrong merged commit f89d7b9 into proxy-contracts Jul 20, 2023

yrong deleted the ron/sno-472-rebased branch July 20, 2023 02:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

sno-472 rebased #890

sno-472 rebased #890

yrong commented Jul 19, 2023 •

edited

Loading

codecov bot commented Jul 19, 2023 •

edited

Loading

yrong commented Jul 19, 2023 •

edited

Loading

doubledup commented Jul 19, 2023

yrong commented Jul 19, 2023

doubledup Jul 19, 2023

yrong Jul 20, 2023

doubledup Jul 20, 2023

	Self::ensure_not_halted().map_err(\|_\| SubmitError::BridgeHalted)?;
	Self::ensure_not_halted().map_err(\|e\| SubmitError::BridgeHalted(e))?;

sno-472 rebased #890

sno-472 rebased #890

Conversation

yrong commented Jul 19, 2023 • edited Loading

codecov bot commented Jul 19, 2023 • edited Loading

Codecov Report

yrong commented Jul 19, 2023 • edited Loading

doubledup commented Jul 19, 2023

yrong commented Jul 19, 2023

doubledup Jul 19, 2023

Choose a reason for hiding this comment

yrong Jul 20, 2023

Choose a reason for hiding this comment

doubledup Jul 20, 2023

Choose a reason for hiding this comment

yrong commented Jul 19, 2023 •

edited

Loading

codecov bot commented Jul 19, 2023 •

edited

Loading

yrong commented Jul 19, 2023 •

edited

Loading