From 134551052f37c4c7ce394f254d5bc24b3d193d67 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 26 Jun 2023 16:52:01 -0300 Subject: [PATCH 1/6] #211 - update @terra-money/terra.js library version (#213) --- package-lock.json | 64 +++++++++++++++++++++++++++++++++++++++-------- package.json | 3 ++- 2 files changed, 56 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4603b9982..61cbb1d80 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@xlabs/portal-bridge-ui", - "version": "0.1.37", + "version": "0.1.39", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@xlabs/portal-bridge-ui", - "version": "0.1.37", + "version": "0.1.39", "dependencies": { "@certusone/wormhole-sdk": "^0.9.18", "@injectivelabs/sdk-ts": "^1.10.72", @@ -36,6 +36,7 @@ "@solana/wallet-adapter-react-ui": "^0.9.5", "@solana/wallet-adapter-wallets": "^0.19.5", "@solana/web3.js": "^1.35.1", + "@terra-money/terra.js": "3.1.9", "@terra-money/wallet-provider": "^3.9.4", "@walletconnect/web3-provider": "^1.7.8", "@xlabs-libs/wallet-aggregator-algorand": "0.0.1-alpha.16", @@ -2366,6 +2367,28 @@ "@chainsafe/persistent-merkle-tree": "^0.6.1" } }, + "node_modules/@classic-terra/terra.proto": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@classic-terra/terra.proto/-/terra.proto-1.1.0.tgz", + "integrity": "sha512-bYhQG5LUaGF0KPRY9hYT/HEcd1QExZPQd6zLV/rQkCe/eDxfwFRLzZHpaaAdfWoAAZjsRWqJbUCqCg7gXBbJpw==", + "dependencies": { + "@improbable-eng/grpc-web": "^0.14.1", + "google-protobuf": "^3.17.3", + "long": "^4.0.0", + "protobufjs": "~6.11.2" + } + }, + "node_modules/@classic-terra/terra.proto/node_modules/@improbable-eng/grpc-web": { + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/@improbable-eng/grpc-web/-/grpc-web-0.14.1.tgz", + "integrity": "sha512-XaIYuunepPxoiGVLLHmlnVminUGzBTnXr8Wv7khzmLWbNw4TCwJKX09GSMJlKhu/TRk6gms0ySFxewaETSBqgw==", + "dependencies": { + "browser-headers": "^0.4.1" + }, + "peerDependencies": { + "google-protobuf": "^3.14.0" + } + }, "node_modules/@cnakazawa/watch": { "version": "1.0.4", "dev": true, @@ -8653,11 +8676,11 @@ } }, "node_modules/@terra-money/terra.js": { - "version": "3.1.7", - "resolved": "https://registry.npmjs.org/@terra-money/terra.js/-/terra.js-3.1.7.tgz", - "integrity": "sha512-z7NwVI1gh0846pgQJaPHya6SRKLd/dHWR5UwWG6T2Pf24I2EjCo8YY5Fay30pCvHTYA2NBFgnWfXEZ/31TfB1Q==", + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/@terra-money/terra.js/-/terra.js-3.1.9.tgz", + "integrity": "sha512-JulSvOHLM56fL7s+cIjIbZeWPBluq883X1soWxA4TG5rKkDythT/DHeLXr3jP5Ld/26VENPSg6lNvK7cEYKpiw==", "dependencies": { - "@terra-money/legacy.proto": "npm:@terra-money/terra.proto@^0.1.7", + "@classic-terra/terra.proto": "^1.1.0", "@terra-money/terra.proto": "^2.1.0", "axios": "^0.27.2", "bech32": "^2.0.0", @@ -40759,6 +40782,27 @@ "@chainsafe/persistent-merkle-tree": "^0.6.1" } }, + "@classic-terra/terra.proto": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@classic-terra/terra.proto/-/terra.proto-1.1.0.tgz", + "integrity": "sha512-bYhQG5LUaGF0KPRY9hYT/HEcd1QExZPQd6zLV/rQkCe/eDxfwFRLzZHpaaAdfWoAAZjsRWqJbUCqCg7gXBbJpw==", + "requires": { + "@improbable-eng/grpc-web": "^0.14.1", + "google-protobuf": "^3.17.3", + "long": "^4.0.0", + "protobufjs": "~6.11.2" + }, + "dependencies": { + "@improbable-eng/grpc-web": { + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/@improbable-eng/grpc-web/-/grpc-web-0.14.1.tgz", + "integrity": "sha512-XaIYuunepPxoiGVLLHmlnVminUGzBTnXr8Wv7khzmLWbNw4TCwJKX09GSMJlKhu/TRk6gms0ySFxewaETSBqgw==", + "requires": { + "browser-headers": "^0.4.1" + } + } + } + }, "@cnakazawa/watch": { "version": "1.0.4", "dev": true, @@ -45128,11 +45172,11 @@ } }, "@terra-money/terra.js": { - "version": "3.1.7", - "resolved": "https://registry.npmjs.org/@terra-money/terra.js/-/terra.js-3.1.7.tgz", - "integrity": "sha512-z7NwVI1gh0846pgQJaPHya6SRKLd/dHWR5UwWG6T2Pf24I2EjCo8YY5Fay30pCvHTYA2NBFgnWfXEZ/31TfB1Q==", + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/@terra-money/terra.js/-/terra.js-3.1.9.tgz", + "integrity": "sha512-JulSvOHLM56fL7s+cIjIbZeWPBluq883X1soWxA4TG5rKkDythT/DHeLXr3jP5Ld/26VENPSg6lNvK7cEYKpiw==", "requires": { - "@terra-money/legacy.proto": "npm:@terra-money/terra.proto@^0.1.7", + "@classic-terra/terra.proto": "^1.1.0", "@terra-money/terra.proto": "^2.1.0", "axios": "^0.27.2", "bech32": "^2.0.0", diff --git a/package.json b/package.json index 02df03512..e7af7467d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@xlabs/portal-bridge-ui", - "version": "0.1.38", + "version": "0.1.39", "private": true, "dependencies": { "@certusone/wormhole-sdk": "^0.9.18", @@ -32,6 +32,7 @@ "@solana/wallet-adapter-wallets": "^0.19.5", "@solana/web3.js": "^1.35.1", "@terra-money/wallet-provider": "^3.9.4", + "@terra-money/terra.js": "3.1.9", "@walletconnect/web3-provider": "^1.7.8", "@xlabs-libs/wallet-aggregator-algorand": "0.0.1-alpha.16", "@xlabs-libs/wallet-aggregator-aptos": "^0.0.1-alpha.9", From 8adc1dd5ac7c707de762346a68ee7979b7c50e86 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 26 Jun 2023 16:53:00 -0300 Subject: [PATCH 2/6] #212 - update injective endpoint to point to general grpc instead of k8s cluster (#214) --- src/utils/consts.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils/consts.ts b/src/utils/consts.ts index 6ca6fb2e9..f12acdf68 100644 --- a/src/utils/consts.ts +++ b/src/utils/consts.ts @@ -722,7 +722,7 @@ export const APTOS_NATIVE_TOKEN_KEY = "0x1::aptos_coin::AptosCoin"; export const getInjectiveNetworkName = () => { if (CLUSTER === "mainnet") { - return Network.MainnetK8s; + return Network.Mainnet; } else if (CLUSTER === "testnet") { return Network.TestnetK8s; } @@ -730,7 +730,7 @@ export const getInjectiveNetworkName = () => { }; export const getInjectiveNetwork = () => { if (CLUSTER === "mainnet") { - return Network.MainnetK8s; + return Network.Mainnet; } else if (CLUSTER === "testnet") { return Network.TestnetK8s; } @@ -739,7 +739,7 @@ export const getInjectiveNetwork = () => { export const getInjectiveNetworkInfo = () => { if (CLUSTER === "mainnet") { - return getNetworkInfo(Network.MainnetK8s); + return getNetworkInfo(Network.Mainnet); } else if (CLUSTER === "testnet") { return getNetworkInfo(Network.TestnetK8s); } From b33a1935bdc21c9c2368205fbbd99683d27c30a2 Mon Sep 17 00:00:00 2001 From: Valentino Conti <41705567+valentinoConti@users.noreply.github.com> Date: Mon, 26 Jun 2023 21:23:52 -0300 Subject: [PATCH 3/6] usdc-bridge deploy (#209) * test usdc-bridge arbitrum * test usdc-bridge arbitrum 2 * test usdc-bridge arbitrum 3 * test usdc-bridge arbitrum 4 * test usdc-bridge arbitrum 5 * [skip ci] bump version * [skip ci] revert action changes --- .github/workflows/preview.yml | 6 +++--- .github/workflows/testnet.yml | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 686326b0e..33c565cf4 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -11,7 +11,7 @@ jobs: concurrency: group: ${{ github.ref }}-cctp-preview cancel-in-progress: true - environment: Cloudflare-Preview + environment: Cloudflare-Preview steps: - name: Checkout repository uses: actions/checkout@v3 @@ -68,7 +68,7 @@ jobs: with: name: docs-preview-build path: docs/build - + portal: name: "Build Portal Bridge" runs-on: "ubuntu-latest" @@ -126,7 +126,7 @@ jobs: publish: name: "Publish" - needs: + needs: - portal - docs - cctp diff --git a/.github/workflows/testnet.yml b/.github/workflows/testnet.yml index 616412e47..cb1784955 100644 --- a/.github/workflows/testnet.yml +++ b/.github/workflows/testnet.yml @@ -11,7 +11,7 @@ jobs: concurrency: group: ${{ github.ref }}-cctp-testnet cancel-in-progress: true - environment: Cloudflare-Testnet + environment: Cloudflare-Testnet steps: - name: Checkout repository uses: actions/checkout@v3 @@ -96,7 +96,7 @@ jobs: publish: name: "Publish" - needs: + needs: - portal - cctp runs-on: "ubuntu-latest" diff --git a/package-lock.json b/package-lock.json index 61cbb1d80..f746c2015 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@xlabs/portal-bridge-ui", - "version": "0.1.39", + "version": "0.1.40", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@xlabs/portal-bridge-ui", - "version": "0.1.39", + "version": "0.1.40", "dependencies": { "@certusone/wormhole-sdk": "^0.9.18", "@injectivelabs/sdk-ts": "^1.10.72", diff --git a/package.json b/package.json index e7af7467d..284e4b521 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@xlabs/portal-bridge-ui", - "version": "0.1.39", + "version": "0.1.40", "private": true, "dependencies": { "@certusone/wormhole-sdk": "^0.9.18", From 5fda5ae0179b4c2660f8d92ecb59b481e927e739 Mon Sep 17 00:00:00 2001 From: Valentino Conti Date: Tue, 27 Jun 2023 01:04:01 -0300 Subject: [PATCH 4/6] usdc-bridge deploy 2 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index f746c2015..e63d70236 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@xlabs/portal-bridge-ui", - "version": "0.1.40", + "version": "0.1.41", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@xlabs/portal-bridge-ui", - "version": "0.1.40", + "version": "0.1.41", "dependencies": { "@certusone/wormhole-sdk": "^0.9.18", "@injectivelabs/sdk-ts": "^1.10.72", diff --git a/package.json b/package.json index 284e4b521..b4fdf33bf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@xlabs/portal-bridge-ui", - "version": "0.1.40", + "version": "0.1.41", "private": true, "dependencies": { "@certusone/wormhole-sdk": "^0.9.18", From 1f5f5c9aeacac3d315768b55fa62f7cdb1cbd0cf Mon Sep 17 00:00:00 2001 From: Valentino Conti <41705567+valentinoConti@users.noreply.github.com> Date: Tue, 27 Jun 2023 01:05:34 -0300 Subject: [PATCH 5/6] usdc-bridge deploy 2 (#215) From cc360fbccb002aa15295147a4eccbfe7630e99a4 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 27 Jun 2023 10:24:10 -0300 Subject: [PATCH 6/6] update usdc bridge links (#216) * update usdc bridge links * [skip ci] - bump version --- package.json | 2 +- public/sui/index.html | 4 ++-- src/App.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b4fdf33bf..5e22e5725 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@xlabs/portal-bridge-ui", - "version": "0.1.41", + "version": "0.1.42", "private": true, "dependencies": { "@certusone/wormhole-sdk": "^0.9.18", diff --git a/public/sui/index.html b/public/sui/index.html index 6e465871e..e3f9a2452 100644 --- a/public/sui/index.html +++ b/public/sui/index.html @@ -43,7 +43,7 @@ Experience frictionless USDC transfers between Ethereum and Avalanche with Circle's CCTP. - + TRY IT NOW @@ -59,7 +59,7 @@ Token Bridge - + USDC Bridge diff --git a/src/App.js b/src/App.js index 79bf9a1d9..4f7e0908d 100644 --- a/src/App.js +++ b/src/App.js @@ -211,7 +211,7 @@ function App() { Avalanche with Circle's CCTP.{" "}