From 3cdc4c295d413038af2513f7c1747006263bbe8b Mon Sep 17 00:00:00 2001 From: daniel1302 Date: Tue, 23 Apr 2024 17:32:21 +0200 Subject: [PATCH 1/5] feat: bump the ganache docker image version --- ganache/prebuild | 4 +++- ganache/version.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ganache/prebuild b/ganache/prebuild index 957c0c2..c2207d4 100755 --- a/ganache/prebuild +++ b/ganache/prebuild @@ -13,9 +13,11 @@ GANACHE_PORT_SECONDARY="8546" case $TARGETARCH in "amd64") GANACHE_PORT="8545" + GANACHE_PORT_SECONDARY="8546" ;; "arm64") - GANACHE_PORT="8546" + GANACHE_PORT="8547" + GANACHE_PORT_SECONDARY="8548" ;; esac diff --git a/ganache/version.json b/ganache/version.json index 60dd1cb..9f97e79 100644 --- a/ganache/version.json +++ b/ganache/version.json @@ -1,4 +1,4 @@ { - "version": "v1.5.0", + "version": "v1.5.1", "name": "vegaprotocol/ganache" } From a5e18ad80f22ae30368b722c10069fe1c10c90ea Mon Sep 17 00:00:00 2001 From: daniel1302 Date: Tue, 23 Apr 2024 17:36:03 +0200 Subject: [PATCH 2/5] feat: update versions.json for ganache --- ganache/version.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ganache/version.json b/ganache/version.json index 9f97e79..3529d4e 100644 --- a/ganache/version.json +++ b/ganache/version.json @@ -1,4 +1,4 @@ { - "version": "v1.5.1", + "version": "v1.5.0", "name": "vegaprotocol/ganache" -} +} \ No newline at end of file From 66a52f05e5bd4148f85028864d30d5b15ce45c1a Mon Sep 17 00:00:00 2001 From: daniel1302 Date: Tue, 23 Apr 2024 17:39:19 +0200 Subject: [PATCH 3/5] fix: ganache docker workflow --- .github/workflows/docker-ganache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-ganache.yml b/.github/workflows/docker-ganache.yml index 15abd10..915f528 100644 --- a/.github/workflows/docker-ganache.yml +++ b/.github/workflows/docker-ganache.yml @@ -13,7 +13,7 @@ on: jobs: build_docker_image: - uses: vegaprotocol/docker-public/.github/workflows/docker-generic.yml@main + uses: vegaprotocol/docker/.github/workflows/docker-generic.yml@main with: image_name: ganache docker_context_path: ./ganache From 8850f2ba4787489ff60e66b68321b58240c46303 Mon Sep 17 00:00:00 2001 From: daniel1302 Date: Tue, 23 Apr 2024 18:21:02 +0200 Subject: [PATCH 4/5] feat: update version for smartcontracts-base --- ganache/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ganache/Dockerfile b/ganache/Dockerfile index 97cab58..2c015b9 100644 --- a/ganache/Dockerfile +++ b/ganache/Dockerfile @@ -1,6 +1,6 @@ ARG GANACHE_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session" -FROM vegaprotocol/smartcontracts-base:v1.5.0 +FROM vegaprotocol/smartcontracts-base:v1.5.1 ARG TARGETARCH ARG GANACHE_MNEMONIC From 162a0bf5d0f0a19a4a1db48aa6f10ef75d9ee225 Mon Sep 17 00:00:00 2001 From: daniel1302 Date: Tue, 23 Apr 2024 22:03:46 +0200 Subject: [PATCH 5/5] fix: test script for ganache image --- ganache/scripts/testing/test_tokens.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ganache/scripts/testing/test_tokens.js b/ganache/scripts/testing/test_tokens.js index 0068a14..10db9c0 100644 --- a/ganache/scripts/testing/test_tokens.js +++ b/ganache/scripts/testing/test_tokens.js @@ -10,9 +10,9 @@ const contractOwner = { }; const randomAccount = '0xCcFb83E3b85e70Fd815C2C690B21E48F7170926B'; -const vegaAddress = '0x8fa21D653C1bF17741055f00dD55663Bc52a8362'; -const tUSDCEthAddress = '0x1b8a1B6CBE5c93609b46D1829Cc7f3Cb8eeE23a0'; -const tBTCEthAddress = '0xb63D135B0a6854EEb765d69ca36210cC70BECAE0'; +const vegaAddress = '0xFcE3C7CBba976414621887F2D762e7fB0f90b5c1'; +const tUSDCEthAddress = '0x9dFD86Aa69c1ad549568c9d51bf2dB27cbDeF2cD'; +const tBTCEthAddress = '0x67175Da1D5e966e40D11c4B2519392B2058373de'; // let w3 = new Web3(new HDWalletProvider([contractOwner.private], "http://127.0.0.1:8545"));