Merge pull request #103 from renproject/feat/upgrade-ffi

renproject · Jun 12, 2021 · a0b3a57 · a0b3a57
2 parents 3a0bc6f + e83619b
commit a0b3a57
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       FILECOIN_FFI_COMMIT: 8b97bd8230b77bd32f4f27e4766a6d8a03b4e801
-      SOLANA_FFI_COMMIT: 1d5f4405dd2fb89c96cde28db33051a6e992d607
+      SOLANA_FFI_COMMIT: d4c670dd402894b7e98a41bccf35d2d5066c573f
     steps:
       - uses: actions/setup-go@v2
         with:
@@ -117,7 +117,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       FILECOIN_FFI_COMMIT: 8b97bd8230b77bd32f4f27e4766a6d8a03b4e801
-      SOLANA_FFI_COMMIT: 1d5f4405dd2fb89c96cde28db33051a6e992d607
+      SOLANA_FFI_COMMIT: d4c670dd402894b7e98a41bccf35d2d5066c573f
     steps:
       - name: Set up Go 1.13
         uses: actions/setup-go@v1
@@ -242,7 +242,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       FILECOIN_FFI_COMMIT: 8b97bd8230b77bd32f4f27e4766a6d8a03b4e801
-      SOLANA_FFI_COMMIT: 1d5f4405dd2fb89c96cde28db33051a6e992d607
+      SOLANA_FFI_COMMIT: d4c670dd402894b7e98a41bccf35d2d5066c573f
     steps:
       - name: Set up Go 1.13
         uses: actions/setup-go@v1
@@ -366,7 +366,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       FILECOIN_FFI_COMMIT: 8b97bd8230b77bd32f4f27e4766a6d8a03b4e801
-      SOLANA_FFI_COMMIT: 1d5f4405dd2fb89c96cde28db33051a6e992d607
+      SOLANA_FFI_COMMIT: d4c670dd402894b7e98a41bccf35d2d5066c573f
     steps:
       - name: Set up Go 1.13
         uses: actions/setup-go@v1
@@ -490,7 +490,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       FILECOIN_FFI_COMMIT: 8b97bd8230b77bd32f4f27e4766a6d8a03b4e801
-      SOLANA_FFI_COMMIT: 1d5f4405dd2fb89c96cde28db33051a6e992d607
+      SOLANA_FFI_COMMIT: d4c670dd402894b7e98a41bccf35d2d5066c573f
     steps:
       - name: Set up Go 1.13
         uses: actions/setup-go@v1
@@ -614,7 +614,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       FILECOIN_FFI_COMMIT: 8b97bd8230b77bd32f4f27e4766a6d8a03b4e801
-      SOLANA_FFI_COMMIT: 1d5f4405dd2fb89c96cde28db33051a6e992d607
+      SOLANA_FFI_COMMIT: d4c670dd402894b7e98a41bccf35d2d5066c573f
     steps:
       - name: Set up Go 1.13
         uses: actions/setup-go@v1

diff --git 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 1d5f4405dd2fb89c96cde28db33051a6e992d607
+RUN git checkout d4c670dd402894b7e98a41bccf35d2d5066c573f
 RUN make clean && make
 RUN go install ./...
diff --git a/chain/solana/solana-ffi b/chain/solana/solana-ffi
diff --git a/chain/solana/solana_test.go b/chain/solana/solana_test.go
@@ -58,7 +58,8 @@ var _ = Describe("Solana", func() {
 			// Mint some tokens.
 			time.Sleep(10 * time.Second)
 			mintAmount := uint64(1000000000) // 10 tokens.
-			mintSig := cgo.GatewayMint(keypairPath, solana.DefaultClientRPCURL, renVmSecret, selector, mintAmount)
+			nilSlice := make([]byte, 32)
+			mintSig := cgo.GatewayMint(keypairPath, solana.DefaultClientRPCURL, renVmSecret, selector, mintAmount, nilSlice, nilSlice)
 			logger.Debug("Mint", zap.String("tx signature", string(mintSig)))
 
 			// Burn some tokens.
+8 −4		cgo/cgo.go
+1 −1		cgo/cgo_helpers.go
+109 −123		rust/Cargo.lock
+1 −1		rust/Cargo.toml
+15 −0		rust/src/lib.rs