Bridge tokens: fix recipient type & downgrade rust toolchain (#234)

* Fix recipient type on withdraw * Bump crates versions * Downgrade rust-toolchain * Fix test * Update contracts builds * Fix test
Near-One · Oct 16, 2023 · 69f5cce · 69f5cce
1 parent 52bfcf2
commit 69f5cce
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -38,8 +38,9 @@ res/ERC20MetadataLogger.json: metadata-connector/contracts/ERC20MetadataLogger.s
 
 test: export BRIDGE_TOKEN = $(realpath res/bridge_token.wasm)
 test:
+	rustup install 1.70.0 && \
 	cd bridge-token-factory && \
-	cargo test --all
+	cargo +1.70.0 test --all
 
 
 test-token-locker:

diff --git a/bridge-token-factory/Cargo.lock b/bridge-token-factory/Cargo.lock
diff --git a/bridge-token-factory/Cargo.toml b/bridge-token-factory/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bridge-token-factory"
-version = "0.2.1"
+version = "0.2.2"
 authors = ["Near Inc <[email protected]>"]
 edition = "2021"
 publish = false

diff --git a/bridge-token-factory/rust-toolchain b/bridge-token-factory/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.70.0"
+channel = "1.69.0"
 components = ["clippy", "rustfmt"]
diff --git a/bridge-token-factory/tests/token_transfer.rs b/bridge-token-factory/tests/token_transfer.rs
@@ -534,7 +534,7 @@ async fn test_upgrade() {
 
     // Verify the factory version
     let factory_version: String = factory.view("version").await.unwrap().json().unwrap();
-    assert_eq!(factory_version, "0.2.1");
+    assert_eq!(factory_version, "0.2.2");
 
     // Set alice as super admin
     let result = factory
@@ -582,7 +582,7 @@ async fn test_upgrade() {
         .unwrap()
         .json()
         .unwrap();
-    assert_eq!(token_version, "0.2.1");
+    assert_eq!(token_version, "0.2.2");
 
     // Upgrade the bridge token over factory (redeploy the same version)
     let result = alice
@@ -605,7 +605,7 @@ async fn test_upgrade() {
         .unwrap()
         .json()
         .unwrap();
-    assert_eq!(token_version, "0.2.1");
+    assert_eq!(token_version, "0.2.2");
 
     // Grant alice the `PauseManager` role
     let result = alice

diff --git a/bridge-token/Cargo.lock b/bridge-token/Cargo.lock
diff --git a/bridge-token/Cargo.toml b/bridge-token/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bridge-token"
-version = "0.2.1"
+version = "0.2.2"
 authors = ["Near Inc <[email protected]>"]
 edition = "2021"
 publish = false

diff --git a/bridge-token/rust-toolchain b/bridge-token/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.70.0"
+channel = "1.69.0"
 components = ["clippy", "rustfmt"]
diff --git a/bridge-token/src/lib.rs b/bridge-token/src/lib.rs
@@ -38,7 +38,7 @@ pub trait ExtBridgeTokenFactory {
     fn finish_withdraw(
         &self,
         #[serializer(borsh)] amount: Balance,
-        #[serializer(borsh)] recipient: AccountId,
+        #[serializer(borsh)] recipient: String,
     ) -> Promise;
 }
 
@@ -113,7 +113,7 @@ impl BridgeToken {
 
         ext_bridge_token_factory::ext(self.controller.clone())
             .with_static_gas(FINISH_WITHDRAW_GAS)
-            .finish_withdraw(amount.into(), recipient.parse().unwrap())
+            .finish_withdraw(amount.into(), recipient)
     }
 
     pub fn account_storage_usage(&self) -> StorageUsage {

diff --git a/res/bridge_token.wasm b/res/bridge_token.wasm
diff --git a/res/bridge_token_factory.wasm b/res/bridge_token_factory.wasm