From 4d06e53795caa39e0d709560e5c9779ee9f0996b Mon Sep 17 00:00:00 2001 From: tok-kkk Date: Tue, 29 Mar 2022 10:18:17 +1100 Subject: [PATCH 1/8] update solana-ffi dependency --- .github/workflows/test.yml | 22 +++++++++++----------- Dockerfile | 2 +- chain/solana/solana-ffi | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a4117676..f568352f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,7 +5,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: ca488a932fea16a4fc09456383c10aa22a6b8585 + SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 @@ -119,7 +119,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: ca488a932fea16a4fc09456383c10aa22a6b8585 + SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 @@ -245,7 +245,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: ca488a932fea16a4fc09456383c10aa22a6b8585 + SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 @@ -370,7 +370,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: ca488a932fea16a4fc09456383c10aa22a6b8585 + SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 @@ -495,7 +495,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: ca488a932fea16a4fc09456383c10aa22a6b8585 + SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 @@ -620,7 +620,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: ca488a932fea16a4fc09456383c10aa22a6b8585 + SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 @@ -747,7 +747,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: ca488a932fea16a4fc09456383c10aa22a6b8585 + SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 @@ -871,7 +871,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: ca488a932fea16a4fc09456383c10aa22a6b8585 + SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 @@ -995,7 +995,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: ca488a932fea16a4fc09456383c10aa22a6b8585 + SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 @@ -1119,7 +1119,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: ca488a932fea16a4fc09456383c10aa22a6b8585 + SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 @@ -1243,7 +1243,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: ca488a932fea16a4fc09456383c10aa22a6b8585 + SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 diff --git a/Dockerfile b/Dockerfile index add0c094..9e398bfc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,6 +45,6 @@ RUN mkdir -p src/github.com/renproject WORKDIR $GOPATH/src/github.com/renproject RUN git clone https://github.com/renproject/solana-ffi WORKDIR $GOPATH/src/github.com/renproject/solana-ffi -RUN git checkout ca488a932fea16a4fc09456383c10aa22a6b8585 +RUN git checkout 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 RUN make clean && make RUN go install ./... diff --git a/chain/solana/solana-ffi b/chain/solana/solana-ffi index ca488a93..91b16c82 160000 --- a/chain/solana/solana-ffi +++ b/chain/solana/solana-ffi @@ -1 +1 @@ -Subproject commit ca488a932fea16a4fc09456383c10aa22a6b8585 +Subproject commit 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 From 0a24fa74ecde7ddede941d64c322d9aec2acdc71 Mon Sep 17 00:00:00 2001 From: tok-kkk Date: Tue, 29 Mar 2022 10:19:11 +1100 Subject: [PATCH 2/8] fix solana test --- chain/solana/solana_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chain/solana/solana_test.go b/chain/solana/solana_test.go index 9bb0c110..1712d52b 100644 --- a/chain/solana/solana_test.go +++ b/chain/solana/solana_test.go @@ -64,7 +64,7 @@ var _ = Describe("Solana", func() { time.Sleep(10 * time.Second) recipient := []byte("mwjUmhAW68zCtgZpW5b1xD5g7MZew6xPV4") Expect(err).NotTo(HaveOccurred()) - burnCount := cgo.GatewayGetBurnCount(solana.DefaultClientRPCURL) + burnCount := cgo.GatewayGetBurnCount(solana.DefaultClientRPCURL, solana.DefaultClientRPCURL) burnAmount := uint64(500000000) // 5 tokens. burnSig := cgo.GatewayBurn(keypairPath, solana.DefaultClientRPCURL, selector, burnCount, burnAmount, uint32(len(recipient)), recipient) logger.Debug("Burn", zap.String("tx signature", string(burnSig))) From 204f46f8a2adc251874688237fa9278d0e4edd86 Mon Sep 17 00:00:00 2001 From: tok-kkk Date: Tue, 29 Mar 2022 10:26:10 +1100 Subject: [PATCH 3/8] try fixing the authentiation issue in the CI --- .github/workflows/test.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f568352f..db0a028a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -81,6 +81,8 @@ jobs: git clone https://github.com/renproject/solana-ffi.git cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} + eval `ssh-agent -s` + ssh-add make clean make @@ -196,6 +198,8 @@ jobs: git clone https://github.com/renproject/solana-ffi.git cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} + eval `ssh-agent -s` + ssh-add make clean make @@ -322,6 +326,8 @@ jobs: git clone https://github.com/renproject/solana-ffi.git cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} + eval `ssh-agent -s` + ssh-add make clean make @@ -447,6 +453,8 @@ jobs: git clone https://github.com/renproject/solana-ffi.git cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} + eval `ssh-agent -s` + ssh-add make clean make @@ -572,6 +580,8 @@ jobs: git clone https://github.com/renproject/solana-ffi.git cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} + eval `ssh-agent -s` + ssh-add make clean make @@ -697,6 +707,8 @@ jobs: git clone https://github.com/renproject/solana-ffi.git cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} + eval `ssh-agent -s` + ssh-add make clean make @@ -824,6 +836,8 @@ jobs: git clone https://github.com/renproject/solana-ffi.git cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} + eval `ssh-agent -s` + ssh-add make clean make @@ -948,6 +962,8 @@ jobs: git clone https://github.com/renproject/solana-ffi.git cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} + eval `ssh-agent -s` + ssh-add make clean make @@ -1072,6 +1088,8 @@ jobs: git clone https://github.com/renproject/solana-ffi.git cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} + eval `ssh-agent -s` + ssh-add make clean make @@ -1196,6 +1214,8 @@ jobs: git clone https://github.com/renproject/solana-ffi.git cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} + eval `ssh-agent -s` + ssh-add make clean make @@ -1320,6 +1340,8 @@ jobs: git clone https://github.com/renproject/solana-ffi.git cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} + eval `ssh-agent -s` + ssh-add make clean make From 1284af4135a46b901dd4d53541af7f316174ed07 Mon Sep 17 00:00:00 2001 From: tok-kkk Date: Tue, 29 Mar 2022 10:39:58 +1100 Subject: [PATCH 4/8] update solana dependency --- .github/workflows/test.yml | 22 +++++++++++----------- Dockerfile | 2 +- chain/solana/solana-ffi | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index db0a028a..dcf6b243 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,7 +5,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 + SOLANA_FFI_COMMIT: 720c0143d8655bfcd412ae73c949474df2c1dcf3 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 @@ -121,7 +121,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 + SOLANA_FFI_COMMIT: 720c0143d8655bfcd412ae73c949474df2c1dcf3 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 @@ -249,7 +249,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 + SOLANA_FFI_COMMIT: 720c0143d8655bfcd412ae73c949474df2c1dcf3 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 @@ -376,7 +376,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 + SOLANA_FFI_COMMIT: 720c0143d8655bfcd412ae73c949474df2c1dcf3 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 @@ -503,7 +503,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 + SOLANA_FFI_COMMIT: 720c0143d8655bfcd412ae73c949474df2c1dcf3 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 @@ -630,7 +630,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 + SOLANA_FFI_COMMIT: 720c0143d8655bfcd412ae73c949474df2c1dcf3 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 @@ -759,7 +759,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 + SOLANA_FFI_COMMIT: 720c0143d8655bfcd412ae73c949474df2c1dcf3 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 @@ -885,7 +885,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 + SOLANA_FFI_COMMIT: 720c0143d8655bfcd412ae73c949474df2c1dcf3 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 @@ -1011,7 +1011,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 + SOLANA_FFI_COMMIT: 720c0143d8655bfcd412ae73c949474df2c1dcf3 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 @@ -1137,7 +1137,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 + SOLANA_FFI_COMMIT: 720c0143d8655bfcd412ae73c949474df2c1dcf3 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 @@ -1263,7 +1263,7 @@ jobs: runs-on: ubuntu-latest env: FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de - SOLANA_FFI_COMMIT: 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 + SOLANA_FFI_COMMIT: 720c0143d8655bfcd412ae73c949474df2c1dcf3 steps: - name: Set up Go 1.16 uses: actions/setup-go@v1 diff --git a/Dockerfile b/Dockerfile index 9e398bfc..8fbdce83 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,6 +45,6 @@ RUN mkdir -p src/github.com/renproject WORKDIR $GOPATH/src/github.com/renproject RUN git clone https://github.com/renproject/solana-ffi WORKDIR $GOPATH/src/github.com/renproject/solana-ffi -RUN git checkout 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 +RUN git checkout 720c0143d8655bfcd412ae73c949474df2c1dcf3 RUN make clean && make RUN go install ./... diff --git a/chain/solana/solana-ffi b/chain/solana/solana-ffi index 91b16c82..720c0143 160000 --- a/chain/solana/solana-ffi +++ b/chain/solana/solana-ffi @@ -1 +1 @@ -Subproject commit 91b16c8283d6a3c7b6fe949d3f581e6059e36f22 +Subproject commit 720c0143d8655bfcd412ae73c949474df2c1dcf3 From d78aaf9443e33fa47bbeb5e887023f5ecc0f06a1 Mon Sep 17 00:00:00 2001 From: tok-kkk Date: Tue, 29 Mar 2022 10:45:00 +1100 Subject: [PATCH 5/8] use https instead of ssh --- .github/workflows/test.yml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dcf6b243..dc5946a7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -81,8 +81,6 @@ jobs: git clone https://github.com/renproject/solana-ffi.git cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} - eval `ssh-agent -s` - ssh-add make clean make @@ -198,8 +196,6 @@ jobs: git clone https://github.com/renproject/solana-ffi.git cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} - eval `ssh-agent -s` - ssh-add make clean make @@ -326,8 +322,6 @@ jobs: git clone https://github.com/renproject/solana-ffi.git cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} - eval `ssh-agent -s` - ssh-add make clean make @@ -454,8 +448,6 @@ jobs: cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} eval `ssh-agent -s` - ssh-add - make clean make - name: Run vetting @@ -580,8 +572,6 @@ jobs: git clone https://github.com/renproject/solana-ffi.git cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} - eval `ssh-agent -s` - ssh-add make clean make @@ -707,8 +697,6 @@ jobs: git clone https://github.com/renproject/solana-ffi.git cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} - eval `ssh-agent -s` - ssh-add make clean make @@ -836,8 +824,6 @@ jobs: git clone https://github.com/renproject/solana-ffi.git cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} - eval `ssh-agent -s` - ssh-add make clean make @@ -962,8 +948,6 @@ jobs: git clone https://github.com/renproject/solana-ffi.git cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} - eval `ssh-agent -s` - ssh-add make clean make @@ -1088,8 +1072,6 @@ jobs: git clone https://github.com/renproject/solana-ffi.git cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} - eval `ssh-agent -s` - ssh-add make clean make @@ -1214,8 +1196,6 @@ jobs: git clone https://github.com/renproject/solana-ffi.git cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} - eval `ssh-agent -s` - ssh-add make clean make @@ -1340,8 +1320,6 @@ jobs: git clone https://github.com/renproject/solana-ffi.git cd solana-ffi git checkout ${{ env.SOLANA_FFI_COMMIT }} - eval `ssh-agent -s` - ssh-add make clean make From 61fe818d847685718513186732777b2c686a3ed6 Mon Sep 17 00:00:00 2001 From: Jaz Gulati Date: Tue, 29 Mar 2022 11:23:41 +1100 Subject: [PATCH 6/8] fix(solana_test): set selector --- chain/solana/solana_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chain/solana/solana_test.go b/chain/solana/solana_test.go index 1712d52b..ed332659 100644 --- a/chain/solana/solana_test.go +++ b/chain/solana/solana_test.go @@ -64,7 +64,7 @@ var _ = Describe("Solana", func() { time.Sleep(10 * time.Second) recipient := []byte("mwjUmhAW68zCtgZpW5b1xD5g7MZew6xPV4") Expect(err).NotTo(HaveOccurred()) - burnCount := cgo.GatewayGetBurnCount(solana.DefaultClientRPCURL, solana.DefaultClientRPCURL) + burnCount := cgo.GatewayGetBurnCount(solana.DefaultClientRPCURL, selector) burnAmount := uint64(500000000) // 5 tokens. burnSig := cgo.GatewayBurn(keypairPath, solana.DefaultClientRPCURL, selector, burnCount, burnAmount, uint32(len(recipient)), recipient) logger.Debug("Burn", zap.String("tx signature", string(burnSig))) From 354b8b7bfaa246ef166c7f498d96a725188a3190 Mon Sep 17 00:00:00 2001 From: tok-kkk Date: Tue, 29 Mar 2022 11:47:14 +1100 Subject: [PATCH 7/8] fix solana test --- chain/solana/solana_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chain/solana/solana_test.go b/chain/solana/solana_test.go index ed332659..ef35b915 100644 --- a/chain/solana/solana_test.go +++ b/chain/solana/solana_test.go @@ -115,7 +115,7 @@ var _ = Describe("Solana", func() { addrEncodeDecoder := solana.NewAddressEncodeDecoder() expectedBtcGateway, _ := addrEncodeDecoder.DecodeAddress(multichain.Address("FDdKRjbBeFtyu5c66cZghJsTTjDTT1aD3zsgTWMTpaif")) - Expect(registry.Count).To(Equal(uint64(1))) + Expect(registry.Count).To(Equal(uint64(3))) Expect(registry.Selectors[0]).To(Equal(btcSelectorHash)) Expect(registry.Selectors[1]).To(Equal(zero)) Expect(len(registry.Selectors)).To(Equal(32)) From 73a71f412d3d292c57173cacc070114e5c3c857e Mon Sep 17 00:00:00 2001 From: tok-kkk Date: Tue, 29 Mar 2022 12:01:43 +1100 Subject: [PATCH 8/8] fix solana tests --- chain/solana/solana_test.go | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/chain/solana/solana_test.go b/chain/solana/solana_test.go index ef35b915..42fc2c48 100644 --- a/chain/solana/solana_test.go +++ b/chain/solana/solana_test.go @@ -108,19 +108,29 @@ var _ = Describe("Solana", func() { // The registry (in the CI test environment) is pre-populated with gateway // addresses for BTC/toSolana selector. + zero := pack.NewU256FromU8(pack.U8(0)).Bytes32() btcSelectorHash := [32]byte{} copy(btcSelectorHash[:], crypto.Keccak256([]byte("BTC/toSolana"))) - zero := pack.NewU256FromU8(pack.U8(0)).Bytes32() + lunaSelectorHash := [32]byte{} + copy(lunaSelectorHash[:], crypto.Keccak256([]byte("LUNA/toSolana"))) + daiSelectorHash := [32]byte{} + copy(daiSelectorHash[:], crypto.Keccak256([]byte("DAI/toSolana"))) addrEncodeDecoder := solana.NewAddressEncodeDecoder() - expectedBtcGateway, _ := addrEncodeDecoder.DecodeAddress(multichain.Address("FDdKRjbBeFtyu5c66cZghJsTTjDTT1aD3zsgTWMTpaif")) + expectedBtcGateway, _ := addrEncodeDecoder.DecodeAddress("FDdKRjbBeFtyu5c66cZghJsTTjDTT1aD3zsgTWMTpaif") + expectedLunaGateway, _ := addrEncodeDecoder.DecodeAddress("3zfUUYDVp68fk9Z8FoKxEcEFqSMhE5UZ3Mw8mGhm5WRt") + expectedDaiGateway, _ := addrEncodeDecoder.DecodeAddress("rZJ8SoJBNWq8Qi6QTNTdVv78DPW6mn2fJUw7CPUvSgA") Expect(registry.Count).To(Equal(uint64(3))) Expect(registry.Selectors[0]).To(Equal(btcSelectorHash)) - Expect(registry.Selectors[1]).To(Equal(zero)) + Expect(registry.Selectors[1]).To(Equal(lunaSelectorHash)) + Expect(registry.Selectors[2]).To(Equal(daiSelectorHash)) + Expect(registry.Selectors[3]).To(Equal(zero)) Expect(len(registry.Selectors)).To(Equal(32)) Expect(registry.Gateways[0][:]).To(Equal([]byte(expectedBtcGateway))) - Expect(registry.Gateways[1]).To(Equal(zero)) + Expect(registry.Gateways[1][:]).To(Equal([]byte(expectedLunaGateway))) + Expect(registry.Gateways[2][:]).To(Equal([]byte(expectedDaiGateway))) + Expect(registry.Gateways[3]).To(Equal(zero)) Expect(len(registry.Gateways)).To(Equal(32)) }) })