From fbbb014c3f53ffbb296578ece20eace9d1c5897a Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Mon, 9 Dec 2024 13:05:12 -0500 Subject: [PATCH 1/8] chore: bump alloy & foundry to latest --- Cargo.toml | 6 +++--- test/scripts/forked_state/docker-compose.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 819d9860..08170d29 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,9 +28,9 @@ serde_json = "1.0" oslog = "0.2.0" log = "0.4.20" -alloy = "0.6.1" -alloy-provider = "0.6.1" -erc6492 = { git = "https://github.com/reown-com/erc6492.git", branch = "main" } +alloy = "0.7.3" +alloy-provider = "0.7.3" +erc6492 = { git = "https://github.com/reown-com/erc6492.git", branch = "chore/bump-alloy-v7" } serial_test = "3.2.0" diff --git a/test/scripts/forked_state/docker-compose.yaml b/test/scripts/forked_state/docker-compose.yaml index 854067e4..c7be6332 100644 --- a/test/scripts/forked_state/docker-compose.yaml +++ b/test/scripts/forked_state/docker-compose.yaml @@ -1,6 +1,6 @@ services: anvil: - image: ghcr.io/foundry-rs/foundry:nightly-96105b4d240681c336e063eac0e250cc51a84414 + image: ghcr.io/foundry-rs/foundry:nightly-00efa0d5965269149f374ba142fb1c3c7edd6c94 restart: unless-stopped ports: ["8545:8545"] entrypoint: [ "anvil", "--fork-url", "https://gateway.tenderly.co/public/sepolia", "--host", "0.0.0.0", "--block-time", "0.1", "--gas-price", "1", "--silent", "--hardfork", "prague" ] From 8df7873f4fd51b0755a9f0b52ca512c9f75268cf Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Mon, 9 Dec 2024 13:17:01 -0500 Subject: [PATCH 2/8] chore: fix CodeQL --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 1f6d5b8d..f2e34879 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,11 @@ CONFIG = debug PLATFORM_IOS = iOS Simulator,id=$(call udid_for,iOS 17.5,iPhone \d\+ Pro [^M]) +build: + # GitHub CodeQL is automatically calling `make build` on PRs + # This Makefile is deprecated, but we need to keep this make target for CodeQL to work + echo "no-op" + build-swift-apple-platforms: export USE_LOCAL_RUST_XCFRAMEWORK=1; \ for platform in "iOS"; do \ From 03d32bd5a196928b34aa8f8ca40e85d1ad316c8f Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Mon, 9 Dec 2024 13:19:00 -0500 Subject: [PATCH 3/8] chore: fix syntax? --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f2e34879..f75f1ae5 100644 --- a/Makefile +++ b/Makefile @@ -2,9 +2,9 @@ CONFIG = debug PLATFORM_IOS = iOS Simulator,id=$(call udid_for,iOS 17.5,iPhone \d\+ Pro [^M]) build: - # GitHub CodeQL is automatically calling `make build` on PRs + # GitHub CodeQL is automatically calling `make build` on PRs # This Makefile is deprecated, but we need to keep this make target for CodeQL to work - echo "no-op" + echo "no-op" build-swift-apple-platforms: export USE_LOCAL_RUST_XCFRAMEWORK=1; \ From 567b03de4652a891e57adf5e80868e5c12353f04 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Mon, 9 Dec 2024 13:26:51 -0500 Subject: [PATCH 4/8] chore: fix CodeQL --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f75f1ae5..3cbdd4fa 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ PLATFORM_IOS = iOS Simulator,id=$(call udid_for,iOS 17.5,iPhone \d\+ Pro [^M]) build: # GitHub CodeQL is automatically calling `make build` on PRs # This Makefile is deprecated, but we need to keep this make target for CodeQL to work - echo "no-op" + cargo build build-swift-apple-platforms: export USE_LOCAL_RUST_XCFRAMEWORK=1; \ From d3e8becf2fd96da8233fda585a36e1872819f03f Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Wed, 11 Dec 2024 09:06:19 -0500 Subject: [PATCH 5/8] chore: bump erc6492 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 08170d29..2e9a8dcf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ log = "0.4.20" alloy = "0.7.3" alloy-provider = "0.7.3" -erc6492 = { git = "https://github.com/reown-com/erc6492.git", branch = "chore/bump-alloy-v7" } +erc6492 = { git = "https://github.com/reown-com/erc6492.git", rev = "3e764e1" } serial_test = "3.2.0" From 2fb43eaf3f9df7c535f459624c3f87062dc1b30e Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Wed, 11 Dec 2024 10:35:37 -0500 Subject: [PATCH 6/8] chore: ditch EOL versions --- .github/workflows/release-dart.yml | 4 ++-- .github/workflows/release-kotlin.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-dart.yml b/.github/workflows/release-dart.yml index 748a6a0f..f7a09814 100644 --- a/.github/workflows/release-dart.yml +++ b/.github/workflows/release-dart.yml @@ -99,7 +99,7 @@ jobs: # Upload artifacts - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: artifacts path: jniLibs/ @@ -113,7 +113,7 @@ jobs: uses: actions/checkout@v3 - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: artifacts path: jniLibs/ diff --git a/.github/workflows/release-kotlin.yml b/.github/workflows/release-kotlin.yml index a686afe9..6a97c8d7 100644 --- a/.github/workflows/release-kotlin.yml +++ b/.github/workflows/release-kotlin.yml @@ -81,7 +81,7 @@ jobs: cp target/${{ matrix.target }}/release/libuniffi_yttrium.so yttrium/libs/$abi_name/ - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: artifacts path: yttrium/ @@ -95,7 +95,7 @@ jobs: uses: actions/checkout@v3 - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: artifacts path: yttrium/ From c09db023c8abd3078f7ffd48fb3acb3411490b41 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Wed, 11 Dec 2024 10:35:46 -0500 Subject: [PATCH 7/8] chore: fix merge --- crates/yttrium/src/chain_abstraction/tests.rs | 4 ++-- crates/yttrium_dart/rust/Cargo.toml | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/crates/yttrium/src/chain_abstraction/tests.rs b/crates/yttrium/src/chain_abstraction/tests.rs index a6944f20..3f1da08c 100644 --- a/crates/yttrium/src/chain_abstraction/tests.rs +++ b/crates/yttrium/src/chain_abstraction/tests.rs @@ -860,7 +860,7 @@ async fn happy_path() { txn.to.unwrap() ); assert_eq!(route_ui_fields.fee.fee.symbol, "ETH"); - assert_eq!(route_ui_fields.fee.fee.unit, Unit::ETHER); + assert_eq!(route_ui_fields.fee.fee.unit, Unit::ETHER.get()); assert!(floats_close( route_ui_fields.fee.fee.as_float_inaccurate(), Amount::new("NULL".to_owned(), fee, Unit::ETHER) @@ -1376,7 +1376,7 @@ async fn happy_path_full_dependency_on_route_ui_fields() { assert_eq!(result.metadata.funding_from.first().unwrap().symbol, "USDC"); assert_eq!( result.metadata.funding_from.first().unwrap().decimals, - Unit::new(6).unwrap() + 6 ); assert_eq!( result diff --git a/crates/yttrium_dart/rust/Cargo.toml b/crates/yttrium_dart/rust/Cargo.toml index c6c73fd8..cba8ab53 100644 --- a/crates/yttrium_dart/rust/Cargo.toml +++ b/crates/yttrium_dart/rust/Cargo.toml @@ -15,7 +15,7 @@ flutter_rust_bridge_codegen = "2.6.0" [dependencies] flutter_rust_bridge = "=2.6.0" -yttrium = { git = "https://github.com/reown-com/yttrium.git", package = "yttrium"} +yttrium = { path = "../../yttrium" } # uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "e796e00ad150f8b14b61a859a2e8c6497b35074e" } openssl = { version = "0.10", features = ["vendored"] } openssl-sys = { version = "0.9.103", features = ["vendored"] } @@ -26,8 +26,7 @@ eyre.workspace = true thiserror.workspace = true alloy.workspace = true -alloy-provider = "0.6.1" -erc6492 = { git = "https://github.com/reown-com/erc6492.git", branch = "main" } +erc6492.workspace = true # Async tokio.workspace = true From 82ecbbd24395b7b5b2142cb3e969ed3c6bb837bd Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Wed, 11 Dec 2024 10:48:28 -0500 Subject: [PATCH 8/8] chore: fmt --- crates/yttrium/src/chain_abstraction/tests.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/crates/yttrium/src/chain_abstraction/tests.rs b/crates/yttrium/src/chain_abstraction/tests.rs index 3f1da08c..0fa1f26f 100644 --- a/crates/yttrium/src/chain_abstraction/tests.rs +++ b/crates/yttrium/src/chain_abstraction/tests.rs @@ -1374,10 +1374,7 @@ async fn happy_path_full_dependency_on_route_ui_fields() { assert_eq!(result.metadata.funding_from.len(), 1); assert_eq!(result.metadata.funding_from.first().unwrap().symbol, "USDC"); - assert_eq!( - result.metadata.funding_from.first().unwrap().decimals, - 6 - ); + assert_eq!(result.metadata.funding_from.first().unwrap().decimals, 6); assert_eq!( result .metadata