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

feat(gear-programs): Erc20 relay program #116

Merged
merged 34 commits into from
Sep 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
67a13ce
initial
gshep Aug 29, 2024
f2ac6c0
implement proofs verification
gshep Aug 29, 2024
3653fd3
fmt & clippy
gshep Sep 2, 2024
a4851c9
implement event
gshep Sep 3, 2024
73c97df
move service to the standalone module
gshep Sep 3, 2024
475ace2
add FungibleTokenManage service
gshep Sep 4, 2024
f15f3f6
tokens mapping test
gshep Sep 9, 2024
f966f1d
sort headers of the proof
gshep Sep 9, 2024
d550ee1
Merge remote-tracking branch 'origin/main'
gshep Sep 12, 2024
57bc017
add support of calculating gas for reply
gshep Sep 16, 2024
66395d1
make address of the VFT gateway optional & related functions
gshep Sep 17, 2024
7baca2b
refactor FTManage
gshep Sep 18, 2024
2982b25
cargo clippy
gshep Sep 19, 2024
9548bc1
refactor test: use program binary from the crate
gshep Sep 19, 2024
049359e
Merge remote-tracking branch 'origin/main'
gshep Sep 25, 2024
b60f658
Merge remote-tracking branch 'origin/main'
gshep Sep 27, 2024
bc92da5
adjust to the new VftGateway interface
gshep Sep 27, 2024
08718c7
fix review remark: use workspace's version & edition
gshep Sep 27, 2024
a84fa94
fix review remark: sails deps
gshep Sep 27, 2024
b0e9216
fix review remark: getrandom/lazy_static deps
gshep Sep 27, 2024
9cd2294
fix review remark: rename the method and introduce a return struct
gshep Sep 27, 2024
b706c90
ignore tests requiring running gear node
gshep Sep 27, 2024
5248187
cargo build/clippy in release mode
gshep Sep 27, 2024
bdbb715
cargo fmt
gshep Sep 27, 2024
7a925ed
remove FTManage service
gshep Sep 29, 2024
62468f1
Merge remote-tracking branch 'origin/main'
gshep Sep 29, 2024
f893840
fix review remark: remove `use super::*;`
gshep Sep 29, 2024
895319a
fix review remark: init vft_gateway address with default value
gshep Sep 29, 2024
5e2b828
fix review remark: don't use PathBuf::join
gshep Sep 29, 2024
17cb94d
fix review remark: remove ERC20Treasury.json
gshep Sep 29, 2024
3cdc121
adjust tests
gshep Sep 29, 2024
f638729
Revert "fix review remark: remove ERC20Treasury.json"
gshep Sep 29, 2024
85b95ee
fix remarks
gshep Sep 29, 2024
4413d12
Merge remote-tracking branch 'origin/main'
gshep Sep 29, 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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
with:
version: nightly
- name: Build
run: cargo build --all-targets
run: cargo build --release --all-targets
lints:
runs-on: kuberunner
steps:
Expand All @@ -49,7 +49,7 @@ jobs:
with:
version: nightly
- name: Run clippy
run: cargo clippy --all-targets -- -D warnings $(cat .lints | cut -f1 -d"#" | tr '\n' ' ')
run: cargo clippy --release --all-targets -- -D warnings $(cat .lints | cut -f1 -d"#" | tr '\n' ' ')
- name: Run rustfmt
run: cargo fmt -- --check
tests:
Expand Down
132 changes: 88 additions & 44 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 11 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ members = [
"gear-programs/vft-client",
"gear-programs/*",
"gear-programs/checkpoint-light-client/io",
"gear-programs/erc20-relay/app",
"gear-programs/erc20-relay/client",
"utils-prometheus",
]

Expand Down Expand Up @@ -59,6 +61,9 @@ gear_proof_storage = { path = "gear-programs/proof-storage" }
checkpoint_light_client-io = { path = "gear-programs/checkpoint-light-client/io", default-features = false }
utils-prometheus = { path = "utils-prometheus" }
checkpoint_light_client = { path = "gear-programs/checkpoint-light-client", default-features = false }
erc20-relay = { path = "gear-programs/erc20-relay" }
erc20-relay-app = { path = "gear-programs/erc20-relay/app" }
erc20-relay-client = { path = "gear-programs/erc20-relay/client" }

# Contracts' deps
extended_vft_wasm = { git = "https://github.com/gear-foundation/standards/", branch = "gstd-pinned-v1.5.0"}
Expand Down Expand Up @@ -98,6 +103,7 @@ ethereum-types = { version = "0.14.1", default-features = false, features = [
ff = { version = "0.13.0", features = ["derive"] }
futures = { version = "0.3.30", features = ["executor"] }
futures-util = "0.3.28"
getrandom = { version = "0.2", default-features = false }
git-download = "0.1"
hash-db = { version = "0.15.2", default-features = false }
hash256-std-hasher = { version = "0.15.2", default-features = false }
Expand All @@ -110,7 +116,7 @@ lazy_static = "1.4.0"
libc = "0.2.153"
log = "0.4.14"
memory-db = { version = "0.27.0", default-features = false }
mockall = { version = "0.12" }
mockall = "0.12"
num = { version = "0.4", features = ["rand"] }
paste = "1.0.14"
pretty_env_logger = "0.5.0"
Expand Down Expand Up @@ -156,9 +162,9 @@ gbuiltin-eth-bridge = { git = "https://github.com/gear-tech/gear.git", tag = "v1
pallet-gear-eth-bridge-rpc-runtime-api = { git = "https://github.com/gear-tech/gear.git", tag = "v1.5.0", default-features = false, features = [
"std",
] }
sails-idl-gen = "0.4.0"
sails-client-gen = "0.4.0"
sails-rs = "0.4.0"
sails-idl-gen = "0.5.0"
sails-client-gen = "0.5.0"
sails-rs = "0.5.0"

subxt = "0.32.1"
sc-consensus-grandpa = { version = "0.10.0-dev", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-v1.4.0", default-features = false }
Expand All @@ -178,6 +184,7 @@ alloy-consensus = { version = "0.2.1", default-features = false }
alloy-eips = { version = "0.2.1", default-features = false }
alloy-rlp = { version = "0.3.8", default-features = false }
alloy-primitives = { version = "0.7.7", default-features = false }
alloy-sol-types = { version = "0.7.7", default-features = false }
alloy = { version = "0.2.0", package = "alloy", features = [
"sol-types",
"contract",
Expand Down
3 changes: 2 additions & 1 deletion ethereum-common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ use core::{
slice::{self, SliceIndex},
};

pub use ethereum_types::{H256, U256};
pub use ethereum_types::{H160, H256, U256};
pub use hash_db;
use parity_scale_codec::{Decode, Encode};
use scale_info::TypeInfo;
use serde::{de, Deserialize};
Expand Down
Loading
Loading