From 8db4a3d7f694be20359cdf106d4faf5f6b4a2b25 Mon Sep 17 00:00:00 2001 From: Alex Gartner Date: Wed, 4 Dec 2024 17:26:24 -0800 Subject: [PATCH 1/4] Add signet and testnet4 addresses (without zrc20) --- v1/data/addresses.testnet.json | 14 ++++++++++++++ v1/tasks/addresses.testnet.json | 14 ++++++++++++++ v2/data/addresses.testnet.json | 18 ++++++++++++++++-- v2/tasks/addresses.testnet.json | 14 ++++++++++++++ 4 files changed, 58 insertions(+), 2 deletions(-) diff --git a/v1/data/addresses.testnet.json b/v1/data/addresses.testnet.json index 065301a16..424515b2a 100644 --- a/v1/data/addresses.testnet.json +++ b/v1/data/addresses.testnet.json @@ -282,6 +282,20 @@ "chain_name": "btc_testnet", "type": "tss" }, + { + "address": "tb1qy9pqmk2pd9sv63g27jt8r657wy0d9ueeh0nqur", + "category": "omnichain", + "chain_id": 18333, + "chain_name": "btc_signet", + "type": "tss" + }, + { + "address": "tb1qy9pqmk2pd9sv63g27jt8r657wy0d9ueeh0nqur", + "category": "omnichain", + "chain_id": 18334, + "chain_name": "btc_testnet4", + "type": "tss" + }, { "address": "0x60E6b70bC2761f878Ff992276612F67FbABC1761", "category": "messaging", diff --git a/v1/tasks/addresses.testnet.json b/v1/tasks/addresses.testnet.json index be6c8c8ae..379ab2a9c 100644 --- a/v1/tasks/addresses.testnet.json +++ b/v1/tasks/addresses.testnet.json @@ -40,5 +40,19 @@ "chain_id": 97, "chain_name": "bsc_testnet", "type": "uniswapV3Router" + }, + { + "address": "tb1qy9pqmk2pd9sv63g27jt8r657wy0d9ueeh0nqur", + "category": "omnichain", + "chain_id": 18333, + "chain_name": "btc_signet", + "type": "tss" + }, + { + "address": "tb1qy9pqmk2pd9sv63g27jt8r657wy0d9ueeh0nqur", + "category": "omnichain", + "chain_id": 18334, + "chain_name": "btc_testnet4", + "type": "tss" } ] diff --git a/v2/data/addresses.testnet.json b/v2/data/addresses.testnet.json index 0f6e49859..b3bc743c6 100644 --- a/v2/data/addresses.testnet.json +++ b/v2/data/addresses.testnet.json @@ -217,8 +217,8 @@ { "address": "tb1qy9pqmk2pd9sv63g27jt8r657wy0d9ueeh0nqur", "category": "omnichain", - "chain_id": 18332, - "chain_name": "btc_testnet", + "chain_id": 18334, + "chain_name": "btc_testnet4", "type": "tss" }, { @@ -242,6 +242,20 @@ "chain_name": "amoy_testnet", "type": "custody" }, + { + "address": "tb1qy9pqmk2pd9sv63g27jt8r657wy0d9ueeh0nqur", + "category": "omnichain", + "chain_id": 18333, + "chain_name": "btc_signet", + "type": "tss" + }, + { + "address": "tb1qy9pqmk2pd9sv63g27jt8r657wy0d9ueeh0nqur", + "category": "omnichain", + "chain_id": 18334, + "chain_name": "btc_testnet4", + "type": "tss" + }, { "address": "0xd80be3710f08d280f51115e072e5d2a778946cd7", "category": "omnichain", diff --git a/v2/tasks/addresses.testnet.json b/v2/tasks/addresses.testnet.json index a19808bfe..a8bfe76b0 100644 --- a/v2/tasks/addresses.testnet.json +++ b/v2/tasks/addresses.testnet.json @@ -68,5 +68,19 @@ "chain_id": 80002, "chain_name": "amoy_testnet", "type": "custody" + }, + { + "address": "tb1qy9pqmk2pd9sv63g27jt8r657wy0d9ueeh0nqur", + "category": "omnichain", + "chain_id": 18333, + "chain_name": "btc_signet", + "type": "tss" + }, + { + "address": "tb1qy9pqmk2pd9sv63g27jt8r657wy0d9ueeh0nqur", + "category": "omnichain", + "chain_id": 18334, + "chain_name": "btc_testnet4", + "type": "tss" } ] \ No newline at end of file From 352aca4247bc909619408be992361c6d33c6c5a9 Mon Sep 17 00:00:00 2001 From: Denis Fadeev Date: Thu, 5 Dec 2024 08:45:12 +0300 Subject: [PATCH 2/4] remove testnet4 and signet --- v2/data/addresses.testnet.json | 38 +++++++++++++++++++-------------- v2/tasks/addresses.testnet.json | 14 ------------ 2 files changed, 22 insertions(+), 30 deletions(-) diff --git a/v2/data/addresses.testnet.json b/v2/data/addresses.testnet.json index b3bc743c6..bc2e0f2ba 100644 --- a/v2/data/addresses.testnet.json +++ b/v2/data/addresses.testnet.json @@ -214,11 +214,24 @@ "symbol": "sBTC", "type": "zrc20" }, + { + "address": "0xfC9201f4116aE6b054722E10b98D904829b469c3", + "asset": "", + "category": "omnichain", + "chain_id": 7001, + "chain_name": "zeta_testnet", + "coin_type": "gas", + "decimals": 8, + "description": "ZetaChain ZRC20 Bitcoin Testnet4", + "foreign_chain_id": "18334", + "symbol": "tBTC", + "type": "zrc20" + }, { "address": "tb1qy9pqmk2pd9sv63g27jt8r657wy0d9ueeh0nqur", "category": "omnichain", - "chain_id": 18334, - "chain_name": "btc_testnet4", + "chain_id": 18332, + "chain_name": "btc_testnet", "type": "tss" }, { @@ -228,6 +241,13 @@ "chain_name": "empty", "type": "tss" }, + { + "address": "tb1qy9pqmk2pd9sv63g27jt8r657wy0d9ueeh0nqur", + "category": "omnichain", + "chain_id": 18334, + "chain_name": "empty", + "type": "tss" + }, { "address": "0x60E6b70bC2761f878Ff992276612F67FbABC1761", "category": "messaging", @@ -242,20 +262,6 @@ "chain_name": "amoy_testnet", "type": "custody" }, - { - "address": "tb1qy9pqmk2pd9sv63g27jt8r657wy0d9ueeh0nqur", - "category": "omnichain", - "chain_id": 18333, - "chain_name": "btc_signet", - "type": "tss" - }, - { - "address": "tb1qy9pqmk2pd9sv63g27jt8r657wy0d9ueeh0nqur", - "category": "omnichain", - "chain_id": 18334, - "chain_name": "btc_testnet4", - "type": "tss" - }, { "address": "0xd80be3710f08d280f51115e072e5d2a778946cd7", "category": "omnichain", diff --git a/v2/tasks/addresses.testnet.json b/v2/tasks/addresses.testnet.json index a8bfe76b0..a19808bfe 100644 --- a/v2/tasks/addresses.testnet.json +++ b/v2/tasks/addresses.testnet.json @@ -68,19 +68,5 @@ "chain_id": 80002, "chain_name": "amoy_testnet", "type": "custody" - }, - { - "address": "tb1qy9pqmk2pd9sv63g27jt8r657wy0d9ueeh0nqur", - "category": "omnichain", - "chain_id": 18333, - "chain_name": "btc_signet", - "type": "tss" - }, - { - "address": "tb1qy9pqmk2pd9sv63g27jt8r657wy0d9ueeh0nqur", - "category": "omnichain", - "chain_id": 18334, - "chain_name": "btc_testnet4", - "type": "tss" } ] \ No newline at end of file From cdc1b469bf5fc0d48e4d6c0b72c6d0d208cffaea Mon Sep 17 00:00:00 2001 From: Denis Fadeev Date: Thu, 5 Dec 2024 08:50:07 +0300 Subject: [PATCH 3/4] update script --- v2/data/addresses.testnet.json | 4 ++-- v2/lib/types.ts | 2 +- v2/tasks/addresses.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/v2/data/addresses.testnet.json b/v2/data/addresses.testnet.json index bc2e0f2ba..d96c48c98 100644 --- a/v2/data/addresses.testnet.json +++ b/v2/data/addresses.testnet.json @@ -238,14 +238,14 @@ "address": "tb1qy9pqmk2pd9sv63g27jt8r657wy0d9ueeh0nqur", "category": "omnichain", "chain_id": 18333, - "chain_name": "empty", + "chain_name": "btc_signet_testnet", "type": "tss" }, { "address": "tb1qy9pqmk2pd9sv63g27jt8r657wy0d9ueeh0nqur", "category": "omnichain", "chain_id": 18334, - "chain_name": "empty", + "chain_name": "btc_testnet4", "type": "tss" }, { diff --git a/v2/lib/types.ts b/v2/lib/types.ts index 269c48a71..72997a9c2 100644 --- a/v2/lib/types.ts +++ b/v2/lib/types.ts @@ -1,4 +1,4 @@ export type ParamSymbol = "USDC.BSC" | "USDC.ETH" | "BTC.BTC" | "ETH.BASE" | "PEPE.ETH" | "BNB.BSC" | "SHIB.ETH" | "USDT.ETH" | "USDT.BSC" | "USDC.BASE" | "POL.POLYGON" | "DAI.ETH" | "ULTI.BSC" | "ETH.ETH" | "USDT.POL" | "ULTI.ETH" | "USDC.POL" | "sETH.SEPOLIA" | "ETH.BASESEPOLIA" | "tBTC" | "MATIC.AMOY" | "USDC" | "SOL.SOLANA" | "USDC.SEPOLIA" | "tBNB" | "sBTC"; -export type ParamChainName = "eth_mainnet" | "bsc_mainnet" | "polygon_mainnet" | "zeta_mainnet" | "btc_mainnet" | "base_mainnet" | "bsc_testnet" | "solana_devnet" | "zeta_testnet" | "btc_testnet" | "empty" | "amoy_testnet" | "base_sepolia" | "sepolia_testnet"; +export type ParamChainName = "eth_mainnet" | "bsc_mainnet" | "polygon_mainnet" | "zeta_mainnet" | "btc_mainnet" | "base_mainnet" | "bsc_testnet" | "solana_devnet" | "zeta_testnet" | "btc_testnet" | "btc_signet_testnet" | "btc_testnet4" | "amoy_testnet" | "base_sepolia" | "sepolia_testnet"; export type ParamType = "connector" | "erc20Custody" | "tss" | "uniswapV2Factory" | "uniswapV2Router02" | "uniswapV3Factory" | "uniswapV3Router" | "weth9" | "zetaToken" | "fungibleModule" | "systemContract" | "zrc20" | "custody" | "gateway"; diff --git a/v2/tasks/addresses.ts b/v2/tasks/addresses.ts index abdbf6e0e..7f4a0355c 100644 --- a/v2/tasks/addresses.ts +++ b/v2/tasks/addresses.ts @@ -65,7 +65,7 @@ const fetchTssData = async (chains: any, addresses: any, network: Network) => { address: isBitcoin ? btc : eth, category: "omnichain", chain_id: parseInt(chain.chain_id), - chain_name: chain.chain_name, + chain_name: chain.name, type: "tss", }); } From 6c6f171e78ae0d84b035f95a6ef8479b1b423ef8 Mon Sep 17 00:00:00 2001 From: Denis Fadeev Date: Tue, 10 Dec 2024 12:38:02 +0300 Subject: [PATCH 4/4] remvoe CI workflows for v1 --- .github/workflows/generated-files_v1.yaml | 60 ----------------------- .github/workflows/test_v1.yaml | 45 ----------------- 2 files changed, 105 deletions(-) delete mode 100644 .github/workflows/generated-files_v1.yaml delete mode 100644 .github/workflows/test_v1.yaml diff --git a/.github/workflows/generated-files_v1.yaml b/.github/workflows/generated-files_v1.yaml deleted file mode 100644 index 28dbe5d25..000000000 --- a/.github/workflows/generated-files_v1.yaml +++ /dev/null @@ -1,60 +0,0 @@ -name: Generated Files are Updated (V1) - -on: - push: - branches: - - main - paths: - - 'v1/**' - pull_request: - branches: - - "*" - paths: - - 'v1/**' - types: - - synchronize - - opened - - reopened - - ready_for_review - -defaults: - run: - working-directory: ./v1 - -jobs: - generate: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: "18.0.0" - registry-url: "https://registry.npmjs.org" - - - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install -y jq unzip - yarn install - - - name: Install specific version of aibgen - run: | - wget https://gethstore.blob.core.windows.net/builds/geth-alltools-linux-amd64-1.11.5-a38f4108.tar.gz - tar -zxvf geth-alltools-linux-amd64-1.11.5-a38f4108.tar.gz - sudo mv geth-alltools-linux-amd64-1.11.5-a38f4108/abigen /usr/local/bin/ - - - name: Generate Go packages and typechain-types - run: | - yarn generate - - - name: Check for changes - run: | - if git diff --exit-code --ignore-space-change --ignore-all-space --ignore-cr-at-eol -- pkg typechain-types; then - echo "Generated Go files are up-to-date." - else - echo "::error::Generated files are not up-to-date. Please run 'yarn generate' locally and commit any changes." - exit 1 - fi diff --git a/.github/workflows/test_v1.yaml b/.github/workflows/test_v1.yaml deleted file mode 100644 index 04fa5d53c..000000000 --- a/.github/workflows/test_v1.yaml +++ /dev/null @@ -1,45 +0,0 @@ -name: Test (V1) - -on: - push: - branches: - - main - paths: - - 'v1/**' - pull_request: - branches: - - "*" - paths: - - 'v1/**' - types: - - synchronize - - opened - - reopened - - ready_for_review - -defaults: - run: - working-directory: ./v1 - -jobs: - test: - runs-on: ubuntu-latest - - steps: - - name: Checkout Repository - uses: actions/checkout@v4 - - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: "18.0.0" - registry-url: "https://registry.npmjs.org" - - - name: Install Dependencies - run: yarn install - - - name: Build project - run: yarn build - - - name: Test (hardhat) - run: yarn test