From e02e3073ce4700cce1dfac49df6e75c6ab7424ce Mon Sep 17 00:00:00 2001 From: Marcelo Fornet Date: Thu, 11 Mar 2021 20:32:38 +0100 Subject: [PATCH] fix: Use new version of the connector. TODO: Don't use current pinned commit from token-connector, instead wait until it is merged into master --- cli/package.json | 2 +- contracts/near/Cargo.lock | 48 +++++++++++++++++++-------------------- yarn.lock | 13 +++-------- 3 files changed, 28 insertions(+), 35 deletions(-) diff --git a/cli/package.json b/cli/package.json index a32d42aa2..12cc4dbfe 100644 --- a/cli/package.json +++ b/cli/package.json @@ -34,7 +34,7 @@ "rainbow-bridge-near2eth-block-relay": "1.0.0", "rainbow-bridge-watchdog": "1.0.0", "rainbow-bridge-testing": "1.0.0", - "rainbow-token-connector": "near/rainbow-token-connector#0646850267c42057e92f2d670eebe79c9c9211f9", + "rainbow-token-connector": "near/rainbow-token-connector#d0b92affe1243445e3ee54368825a6e6f083772e", "request": "^2.88.2" } } \ No newline at end of file diff --git a/contracts/near/Cargo.lock b/contracts/near/Cargo.lock index b18aac541..0cecb3e8c 100644 --- a/contracts/near/Cargo.lock +++ b/contracts/near/Cargo.lock @@ -1642,34 +1642,33 @@ dependencies = [ [[package]] name = "near-rpc-error-core" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffa8dbf8437a28ac40fcb85859ab0d0b8385013935b000c7a51ae79631dd74d9" +source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", "serde", - "serde_json", "syn 1.0.57", ] [[package]] name = "near-rpc-error-core" version = "0.1.0" -source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffa8dbf8437a28ac40fcb85859ab0d0b8385013935b000c7a51ae79631dd74d9" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", "serde", + "serde_json", "syn 1.0.57", ] [[package]] name = "near-rpc-error-macro" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6111d713e90c7c551dee937f4a06cb9ea2672243455a4454cc7566387ba2d9" +source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200" dependencies = [ - "near-rpc-error-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "near-rpc-error-core 0.1.0 (git+https://github.com/nearprotocol/nearcore.git)", "proc-macro2 1.0.24", "quote 1.0.7", "serde", @@ -1680,9 +1679,10 @@ dependencies = [ [[package]] name = "near-rpc-error-macro" version = "0.1.0" -source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c6111d713e90c7c551dee937f4a06cb9ea2672243455a4454cc7566387ba2d9" dependencies = [ - "near-rpc-error-core 0.1.0 (git+https://github.com/nearprotocol/nearcore.git)", + "near-rpc-error-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.24", "quote 1.0.7", "serde", @@ -1704,8 +1704,7 @@ dependencies = [ [[package]] name = "near-runtime-fees" version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4992274c8acb33fa1246715d3aafbce5688ae82243c779b561f8eaff1bb6f1" +source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200" dependencies = [ "num-rational 0.2.4", "serde", @@ -1714,7 +1713,8 @@ dependencies = [ [[package]] name = "near-runtime-fees" version = "0.9.1" -source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4992274c8acb33fa1246715d3aafbce5688ae82243c779b561f8eaff1bb6f1" dependencies = [ "num-rational 0.2.4", "serde", @@ -1844,21 +1844,21 @@ dependencies = [ [[package]] name = "near-vm-errors" version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "386c2c07ef37ae52ad43860ef69c6322bbc1e610ae0c08c1d7f5ff56f4c28e6a" +source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200" dependencies = [ "borsh 0.6.2", - "near-rpc-error-macro 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "near-rpc-error-macro 0.1.0 (git+https://github.com/nearprotocol/nearcore.git)", "serde", ] [[package]] name = "near-vm-errors" version = "0.9.1" -source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "386c2c07ef37ae52ad43860ef69c6322bbc1e610ae0c08c1d7f5ff56f4c28e6a" dependencies = [ "borsh 0.6.2", - "near-rpc-error-macro 0.1.0 (git+https://github.com/nearprotocol/nearcore.git)", + "near-rpc-error-macro 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde", ] @@ -1877,14 +1877,13 @@ dependencies = [ [[package]] name = "near-vm-logic" version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6da6c80d3428f45248577820bfc943b8261a6f11d6721037e5c3f43484047cd" +source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200" dependencies = [ "base64 0.11.0", "bs58 0.3.1", "byteorder", - "near-runtime-fees 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "near-vm-errors 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "near-runtime-fees 0.9.1 (git+https://github.com/nearprotocol/nearcore.git)", + "near-vm-errors 0.9.1 (git+https://github.com/nearprotocol/nearcore.git)", "serde", "sha2 0.8.2", "sha3", @@ -1893,13 +1892,14 @@ dependencies = [ [[package]] name = "near-vm-logic" version = "0.9.1" -source = "git+https://github.com/nearprotocol/nearcore.git#06674af003f0031d1ec2dbd226c309bde5b5d200" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6da6c80d3428f45248577820bfc943b8261a6f11d6721037e5c3f43484047cd" dependencies = [ "base64 0.11.0", "bs58 0.3.1", "byteorder", - "near-runtime-fees 0.9.1 (git+https://github.com/nearprotocol/nearcore.git)", - "near-vm-errors 0.9.1 (git+https://github.com/nearprotocol/nearcore.git)", + "near-runtime-fees 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "near-vm-errors 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde", "sha2 0.8.2", "sha3", diff --git a/yarn.lock b/yarn.lock index c6d19f621..abad862b1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4254,9 +4254,9 @@ query-string@^5.0.1: object-assign "^4.1.0" strict-uri-encode "^1.0.0" -rainbow-token-connector@near/rainbow-token-connector#0646850267c42057e92f2d670eebe79c9c9211f9: +rainbow-token-connector@near/rainbow-token-connector#d0b92affe1243445e3ee54368825a6e6f083772e: version "0.0.0" - resolved "https://codeload.github.com/near/rainbow-token-connector/tar.gz/0646850267c42057e92f2d670eebe79c9c9211f9" + resolved "https://codeload.github.com/near/rainbow-token-connector/tar.gz/d0b92affe1243445e3ee54368825a6e6f083772e" randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0: version "2.1.0" @@ -4537,14 +4537,7 @@ semver@6.3.0, semver@^6.0.0, semver@^6.1.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.2, semver@^7.2.1: - version "7.3.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" - integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== - dependencies: - lru-cache "^6.0.0" - -semver@^7.3.4: +semver@^7.2, semver@^7.2.1, semver@^7.3.4: version "7.3.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==