From bdc38bb4b64d03fe9e4133b85c136205c40df39a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20Bald=C3=A9=20=28WSL=20Win11=20Pro=29?= Date: Fri, 29 Mar 2024 15:43:51 +0000 Subject: [PATCH 1/4] Bump `Cargo.lock` in `ramm-sui-deploy` --- ramm-sui-deploy/Cargo.lock | 49 ++++++++++---------------------------- 1 file changed, 13 insertions(+), 36 deletions(-) diff --git a/ramm-sui-deploy/Cargo.lock b/ramm-sui-deploy/Cargo.lock index fd704ea..af679f7 100644 --- a/ramm-sui-deploy/Cargo.lock +++ b/ramm-sui-deploy/Cargo.lock @@ -1184,15 +1184,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "core-foundation" version = "0.9.3" @@ -1503,7 +1494,7 @@ version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ - "convert_case 0.4.0", + "convert_case", "proc-macro2 1.0.67", "quote 1.0.33", "rustc_version", @@ -1796,7 +1787,7 @@ dependencies = [ [[package]] name = "fastcrypto" version = "0.1.7" -source = "git+https://github.com/MystenLabs/fastcrypto?rev=ea66012b860d9dd152abb7f2156275698ee91126#ea66012b860d9dd152abb7f2156275698ee91126" +source = "git+https://github.com/MystenLabs/fastcrypto?rev=a499d84d07cbe33014531249f6ceeff85664502d#a499d84d07cbe33014531249f6ceeff85664502d" dependencies = [ "aes", "aes-gcm", @@ -1839,7 +1830,6 @@ dependencies = [ "schemars", "secp256k1", "serde", - "serde_bytes", "serde_json", "serde_with", "sha2 0.10.8", @@ -1855,10 +1845,8 @@ dependencies = [ [[package]] name = "fastcrypto-derive" version = "0.1.3" -source = "git+https://github.com/MystenLabs/fastcrypto?rev=ea66012b860d9dd152abb7f2156275698ee91126#ea66012b860d9dd152abb7f2156275698ee91126" +source = "git+https://github.com/MystenLabs/fastcrypto?rev=a499d84d07cbe33014531249f6ceeff85664502d#a499d84d07cbe33014531249f6ceeff85664502d" dependencies = [ - "convert_case 0.6.0", - "proc-macro2 1.0.67", "quote 1.0.33", "syn 1.0.109", ] @@ -1866,13 +1854,11 @@ dependencies = [ [[package]] name = "fastcrypto-tbls" version = "0.1.0" -source = "git+https://github.com/MystenLabs/fastcrypto?rev=ea66012b860d9dd152abb7f2156275698ee91126#ea66012b860d9dd152abb7f2156275698ee91126" +source = "git+https://github.com/MystenLabs/fastcrypto?rev=a499d84d07cbe33014531249f6ceeff85664502d#a499d84d07cbe33014531249f6ceeff85664502d" dependencies = [ "bcs", - "bincode", "digest 0.10.7", "fastcrypto", - "fastcrypto-derive", "hex", "itertools 0.10.5", "rand", @@ -1881,13 +1867,12 @@ dependencies = [ "tap", "tracing", "typenum", - "zeroize", ] [[package]] name = "fastcrypto-zkp" version = "0.1.2" -source = "git+https://github.com/MystenLabs/fastcrypto?rev=ea66012b860d9dd152abb7f2156275698ee91126#ea66012b860d9dd152abb7f2156275698ee91126" +source = "git+https://github.com/MystenLabs/fastcrypto?rev=a499d84d07cbe33014531249f6ceeff85664502d#a499d84d07cbe33014531249f6ceeff85664502d" dependencies = [ "ark-bls12-381", "ark-bn254", @@ -1897,7 +1882,6 @@ dependencies = [ "ark-relations", "ark-serialize", "ark-snark", - "bcs", "blst", "byte-slice-cast", "derive_more", @@ -1908,9 +1892,7 @@ dependencies = [ "neptune", "num-bigint 0.4.4", "once_cell", - "regex", "reqwest", - "rustls-webpki", "schemars", "serde", "serde_json", @@ -3041,6 +3023,7 @@ dependencies = [ "move-core-types", "move-ir-to-bytecode", "move-ir-types", + "move-proc-macros", "move-symbol-pool", "once_cell", "pathdiff", @@ -3438,7 +3421,6 @@ name = "narwhal-config" version = "0.1.0" dependencies = [ "fastcrypto", - "fastcrypto-tbls", "match_opt", "mysten-network", "mysten-util-mem", @@ -3456,7 +3438,6 @@ version = "0.1.0" dependencies = [ "bcs", "fastcrypto", - "fastcrypto-tbls", "serde", "shared-crypto", ] @@ -3594,9 +3575,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -5486,7 +5467,7 @@ dependencies = [ [[package]] name = "sui-move-build" -version = "1.20.0" +version = "1.21.1" dependencies = [ "anyhow", "fastcrypto", @@ -5508,7 +5489,7 @@ dependencies = [ [[package]] name = "sui-open-rpc" -version = "1.20.0" +version = "1.21.1" dependencies = [ "bcs", "schemars", @@ -5564,7 +5545,7 @@ dependencies = [ [[package]] name = "sui-sdk" -version = "1.20.0" +version = "1.21.1" dependencies = [ "anyhow", "async-trait", @@ -5643,6 +5624,8 @@ dependencies = [ "narwhal-config", "narwhal-crypto", "nonempty", + "num-bigint 0.4.4", + "num-traits", "once_cell", "prometheus", "proptest", @@ -6308,12 +6291,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - [[package]] name = "unicode-width" version = "0.1.11" From 566e0a2b2ee7f551f9f2fe093fa4e10b9248a329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20Bald=C3=A9=20=28WSL=20Win11=20Pro=29?= Date: Fri, 29 Mar 2024 15:44:09 +0000 Subject: [PATCH 2/4] Add new data for both mainnet and testnet to `Move.toml` --- ramm-sui/Move.lock | 7 ++++++- ramm-sui/Move.toml | 10 +++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ramm-sui/Move.lock b/ramm-sui/Move.lock index 99855a1..7743a57 100644 --- a/ramm-sui/Move.lock +++ b/ramm-sui/Move.lock @@ -2,7 +2,7 @@ [move] version = 0 -manifest_digest = "82390F354A262686B0F5519B9FBF68A1FB7C4F5E78AD01C59F428E806D625980" +manifest_digest = "E78137C746596EC13830EFFA68C134750EAE0456EF877CBFE762ED8E55D2DD64" deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3" dependencies = [ @@ -31,3 +31,8 @@ dependencies = [ { name = "MoveStdlib" }, { name = "Sui" }, ] + +[move.toolchain-version] +compiler-version = "1.21.1" +edition = "legacy" +flavor = "sui" diff --git a/ramm-sui/Move.toml b/ramm-sui/Move.toml index fd97df4..59ac7f3 100644 --- a/ramm-sui/Move.toml +++ b/ramm-sui/Move.toml @@ -1,7 +1,12 @@ [package] name = "ramm_sui" version = "0.0.1" -# First version on package published in mainnet with ID: +# First version of package published in testnet with ID: +#published-at = "0xd3283fa556731370cd2a7f389b3e35c630184118b5af416ce9e57edfce751496" +# Upgraded to ID: +#published-at = "0xb93c139768a9dfdb6898475052be3ac1d93b92dccf2288c96a8e227f3e511ef6" + +# First version of package published in mainnet with ID: #published-at = "0xd4e097d82d73dc5d152f277bd17ba7980cad4c0b238c3609517cbd0cf686ddd1" # Upgraded to ID: #published-at = "0xcb6640194b37023f6bed705f40ff22883eb6007d4c69e72c317c64671f9f6b29" @@ -15,4 +20,7 @@ SwitchboardStdLib = { git = "https://github.com/switchboard-xyz/sbv2-sui.git", s ramm_sui = "0x0" std = "0x1" sui = "0x2" +# mainnet switchboard = "0x08d79f4d920b03d88faca1e421af023a87fbb1e4a6fd200248e6e9998d09e470" +# testnet +#switchboard = "0x98670585b87e06628ef2d7f7cb1e7bee8ada65b43b82997935225a7e6e21d18e" From 8a5270dd9b6dcc80147b054fcaa3069ba0866b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20Bald=C3=A9=20=28WSL=20Win11=20Pro=29?= Date: Fri, 29 Mar 2024 15:44:42 +0000 Subject: [PATCH 3/4] Update testnet deployment configs with new package ID --- deployment_cfgs/testnet/ada_dot_sol.toml | 3 ++- deployment_cfgs/testnet/btc_eth_sol.toml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deployment_cfgs/testnet/ada_dot_sol.toml b/deployment_cfgs/testnet/ada_dot_sol.toml index 2288988..d953a40 100644 --- a/deployment_cfgs/testnet/ada_dot_sol.toml +++ b/deployment_cfgs/testnet/ada_dot_sol.toml @@ -1,6 +1,7 @@ # The target network to which the RAMM will be published. target_env = "testnet" -ramm_pkg_addr_or_path = "../ramm-sui" +#ramm_pkg_addr_or_path = "../ramm-sui" +ramm_pkg_addr_or_path = "0xb93c139768a9dfdb6898475052be3ac1d93b92dccf2288c96a8e227f3e511ef6" asset_count = 3 fee_collection_address = "0x47c450aae7a9e4bee707d6f18156562c3516caf535a48a845a22c090a18d38b4" diff --git a/deployment_cfgs/testnet/btc_eth_sol.toml b/deployment_cfgs/testnet/btc_eth_sol.toml index 462a881..1c10b3d 100644 --- a/deployment_cfgs/testnet/btc_eth_sol.toml +++ b/deployment_cfgs/testnet/btc_eth_sol.toml @@ -1,7 +1,7 @@ # The target network to which the RAMM will be published. target_env = "testnet" #ramm_pkg_addr_or_path = "../ramm-sui" -ramm_pkg_addr_or_path = "0xd3283fa556731370cd2a7f389b3e35c630184118b5af416ce9e57edfce751496" +ramm_pkg_addr_or_path = "0xb93c139768a9dfdb6898475052be3ac1d93b92dccf2288c96a8e227f3e511ef6" asset_count = 3 fee_collection_address = "0xa53a6598e203f035cd665c11f1213402f31214eb76b841cef4fcc3825d512a97" From 0564b49dbaf0cec485e09109a24f2c5813071698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20Bald=C3=A9=20=28WSL=20Win11=20Pro=29?= Date: Fri, 29 Mar 2024 15:47:24 +0000 Subject: [PATCH 4/4] Update CI job's name --- .github/workflows/continuous-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 6f01cba..6ae8baf 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -1,4 +1,4 @@ -name: Build/test `ramm-misc`, `ramm-sui`, `ramm-sui-deploy` +name: Build/test `ramm-misc`, `ramm-sui` run-name: GitHub Actions CI for `ramm-sui` on: push: