Skip to content

Commit 08050f3

Browse files
authoredJan 31, 2022
Merge pull request #140 from renproject/feat/zcash-nu5-upgrade
Zcash NU5 upgrade
2 parents ca30e40 + 4a0bd25 commit 08050f3

File tree

5 files changed

+18
-4
lines changed

5 files changed

+18
-4
lines changed
 

‎.github/workflows/test.yml

+12-1
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,12 @@ jobs:
9090
source $HOME/.cargo/env
9191
go mod edit -replace=github.com/filecoin-project/filecoin-ffi=./.extern/filecoin-ffi
9292
go mod edit -replace=github.com/renproject/solana-ffi=./.extern/solana-ffi
93+
go mod tidy
9394
go vet ./...
9495
9596
- name: Setup environment for Solana tests
9697
run: |
97-
sh -c "$(curl -sSfL https://release.solana.com/v1.7.12/install)"
98+
sh -c "$(curl -sSfL https://release.solana.com/v1.8.14/install)"
9899
cd $GITHUB_WORKSPACE
99100
export PATH="/home/runner/.local/share/solana/install/active_release/bin:$PATH"
100101
echo ${{ secrets.SOLANA_KEY }} > ~/.config/solana/id.json
@@ -204,6 +205,7 @@ jobs:
204205
source $HOME/.cargo/env
205206
go mod edit -replace=github.com/filecoin-project/filecoin-ffi=./.extern/filecoin-ffi
206207
go mod edit -replace=github.com/renproject/solana-ffi=./.extern/solana-ffi
208+
go mod tidy
207209
go vet ./...
208210
209211
- name: Run linting
@@ -329,6 +331,7 @@ jobs:
329331
source $HOME/.cargo/env
330332
go mod edit -replace=github.com/filecoin-project/filecoin-ffi=./.extern/filecoin-ffi
331333
go mod edit -replace=github.com/renproject/solana-ffi=./.extern/solana-ffi
334+
go mod tidy
332335
go vet ./...
333336
334337
- name: Run linting
@@ -453,6 +456,7 @@ jobs:
453456
source $HOME/.cargo/env
454457
go mod edit -replace=github.com/filecoin-project/filecoin-ffi=./.extern/filecoin-ffi
455458
go mod edit -replace=github.com/renproject/solana-ffi=./.extern/solana-ffi
459+
go mod tidy
456460
go vet ./...
457461
458462
- name: Run linting
@@ -577,6 +581,7 @@ jobs:
577581
source $HOME/.cargo/env
578582
go mod edit -replace=github.com/filecoin-project/filecoin-ffi=./.extern/filecoin-ffi
579583
go mod edit -replace=github.com/renproject/solana-ffi=./.extern/solana-ffi
584+
go mod tidy
580585
go vet ./...
581586
582587
- name: Run linting
@@ -701,6 +706,7 @@ jobs:
701706
source $HOME/.cargo/env
702707
go mod edit -replace=github.com/filecoin-project/filecoin-ffi=./.extern/filecoin-ffi
703708
go mod edit -replace=github.com/renproject/solana-ffi=./.extern/solana-ffi
709+
go mod tidy
704710
go vet ./...
705711
706712
- name: Run linting
@@ -827,6 +833,7 @@ jobs:
827833
source $HOME/.cargo/env
828834
go mod edit -replace=github.com/filecoin-project/filecoin-ffi=./.extern/filecoin-ffi
829835
go mod edit -replace=github.com/renproject/solana-ffi=./.extern/solana-ffi
836+
go mod tidy
830837
go vet ./...
831838
832839
- name: Run linting
@@ -950,6 +957,7 @@ jobs:
950957
source $HOME/.cargo/env
951958
go mod edit -replace=github.com/filecoin-project/filecoin-ffi=./.extern/filecoin-ffi
952959
go mod edit -replace=github.com/renproject/solana-ffi=./.extern/solana-ffi
960+
go mod tidy
953961
go vet ./...
954962
955963
- name: Run linting
@@ -1073,6 +1081,7 @@ jobs:
10731081
source $HOME/.cargo/env
10741082
go mod edit -replace=github.com/filecoin-project/filecoin-ffi=./.extern/filecoin-ffi
10751083
go mod edit -replace=github.com/renproject/solana-ffi=./.extern/solana-ffi
1084+
go mod tidy
10761085
go vet ./...
10771086
10781087
- name: Run linting
@@ -1196,6 +1205,7 @@ jobs:
11961205
source $HOME/.cargo/env
11971206
go mod edit -replace=github.com/filecoin-project/filecoin-ffi=./.extern/filecoin-ffi
11981207
go mod edit -replace=github.com/renproject/solana-ffi=./.extern/solana-ffi
1208+
go mod tidy
11991209
go vet ./...
12001210
12011211
- name: Run linting
@@ -1319,6 +1329,7 @@ jobs:
13191329
source $HOME/.cargo/env
13201330
go mod edit -replace=github.com/filecoin-project/filecoin-ffi=./.extern/filecoin-ffi
13211331
go mod edit -replace=github.com/renproject/solana-ffi=./.extern/solana-ffi
1332+
go mod tidy
13221333
go vet ./...
13231334
13241335
- name: Run linting

‎chain/zcash/zcash.go

+2
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ var (
6565
{584000, []byte{0x60, 0x0E, 0xB4, 0x2B}},
6666
{903800, []byte{0x0B, 0x23, 0xB9, 0xF5}},
6767
{1028500, []byte{0xA6, 0x75, 0xff, 0xe9}},
68+
{1590000, []byte{0x21, 0x96, 0x51, 0x37}},
6869
},
6970
}
7071

@@ -81,6 +82,7 @@ var (
8182
{30, []byte{0x60, 0x0E, 0xB4, 0x2B}},
8283
{40, []byte{0x0B, 0x23, 0xB9, 0xF5}},
8384
{50, []byte{0xA6, 0x75, 0xff, 0xe9}},
85+
{60, []byte{0x21, 0x96, 0x51, 0x37}},
8486
},
8587
}
8688
)

‎infra/avalanche/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:groovy
1+
FROM ubuntu:bionic
22

33
RUN apt update -y
44
RUN apt-get install -y wget curl build-essential

‎infra/fantom/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:groovy
1+
FROM ubuntu:bionic
22

33
# Install dependencies
44
RUN apt-get update -y

‎infra/zcash/run.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ zcashd \
88
-nuparams=76b809bb:20 \
99
-nuparams=2bb40e60:30 \
1010
-nuparams=f5b9230b:40 \
11-
-nuparams=e9ff75a6:50
11+
-nuparams=e9ff75a6:50 \
12+
-nuparams=37519621:60
1213
sleep 20
1314

1415
echo "ZCASH_ADDRESS=$ADDRESS"

0 commit comments

Comments
 (0)