Skip to content

Commit cdce991

Browse files
turbolentturbolent
authored
Merge pull request #8192 from onflow/auto-update-onflow-cadence-v1.8.6
Update to Cadence v1.8.6
2 parents f79ff57 + 3743e0b commit cdce991

File tree

8 files changed

+27
-23
lines changed

8 files changed

+27
-23
lines changed

‎engine/execution/state/bootstrap/bootstrap_test.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ func TestBootstrapLedger(t *testing.T) {
5757
}
5858

5959
func TestBootstrapLedger_ZeroTokenSupply(t *testing.T) {
60-
expectedStateCommitmentBytes, _ := hex.DecodeString("2a5475ed7fb1a4f76b1aa1c592dfebe913d9b441cc9102fe3870a2a3c9329d87")
60+
expectedStateCommitmentBytes, _ := hex.DecodeString(
61+
"9b45ac2b9e1e04fd57761d551110d988c1737855d17f2f540c4b6c79c4b5058e",
62+
)
6163
expectedStateCommitment, err := flow.ToStateCommitment(expectedStateCommitmentBytes)
6264
require.NoError(t, err)
6365

@@ -104,7 +106,9 @@ func TestBootstrapLedger_ZeroTokenSupply(t *testing.T) {
104106
// - transaction fee deduction
105107
// This tests that the state commitment has not changed for the bookkeeping parts of the transaction.
106108
func TestBootstrapLedger_EmptyTransaction(t *testing.T) {
107-
expectedStateCommitmentBytes, _ := hex.DecodeString("3932e2b94bc248ce6f50defe435e5cdbdb7c572fd44eb39d954b37c2aa5a2720")
109+
expectedStateCommitmentBytes, _ := hex.DecodeString(
110+
"52ca1f4d53adc9ff018f10473a8bd02b4dc9baf5ab04bc1ac0fbb5b40e780d83",
111+
)
108112
expectedStateCommitment, err := flow.ToStateCommitment(expectedStateCommitmentBytes)
109113
require.NoError(t, err)
110114

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ require (
4747
github.com/multiformats/go-multiaddr-dns v0.4.1
4848
github.com/multiformats/go-multihash v0.2.3
4949
github.com/onflow/atree v0.12.0
50-
github.com/onflow/cadence v1.8.5
50+
github.com/onflow/cadence v1.8.6
5151
github.com/onflow/crypto v0.25.3
5252
github.com/onflow/flow v0.4.15
5353
github.com/onflow/flow-core-contracts/lib/go/contracts v1.9.2
5454
github.com/onflow/flow-core-contracts/lib/go/templates v1.9.2
55-
github.com/onflow/flow-go-sdk v1.9.4
55+
github.com/onflow/flow-go-sdk v1.9.5
5656
github.com/onflow/flow/protobuf/go/flow v0.4.18
5757
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
5858
github.com/pkg/errors v0.9.1

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -940,8 +940,8 @@ github.com/onflow/atree v0.12.0 h1:X7/UEPyCaaEQ1gCg11KDvfyEtEeQLhtRtxMHjAiH/Co=
940940
github.com/onflow/atree v0.12.0/go.mod h1:qdZcfLQwPirHcNpLiK+2t3KAo+SAb9Si6TqurE6pykE=
941941
github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483 h1:LpiQhTAfM9CAmNVEs0n//cBBgCg+vJSiIxTHYUklZ84=
942942
github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483/go.mod h1:pIZgTWdm3k3pLF9Uq6MB8JEcW07UDwNJjlXW1HELW80=
943-
github.com/onflow/cadence v1.8.5 h1:TLjmXDK01rN542suJQlfaGctztUvbE2zfiqG/OFZie0=
944-
github.com/onflow/cadence v1.8.5/go.mod h1:CWPsQ/IiS6ehhKRArmwN6gtg1v9Z4qJLJubzfdl3X4g=
943+
github.com/onflow/cadence v1.8.6 h1:IrRKAq2JsGTOPaEO0CwtwTgv2qfyOoGyeoCpydFoHNI=
944+
github.com/onflow/cadence v1.8.6/go.mod h1:CWPsQ/IiS6ehhKRArmwN6gtg1v9Z4qJLJubzfdl3X4g=
945945
github.com/onflow/crypto v0.25.3 h1:XQ3HtLsw8h1+pBN+NQ1JYM9mS2mVXTyg55OldaAIF7U=
946946
github.com/onflow/crypto v0.25.3/go.mod h1:+1igaXiK6Tjm9wQOBD1EGwW7bYWMUGKtwKJ/2QL/OWs=
947947
github.com/onflow/fixed-point v0.1.1 h1:j0jYZVO8VGyk1476alGudEg7XqCkeTVxb5ElRJRKS90=
@@ -958,8 +958,8 @@ github.com/onflow/flow-ft/lib/go/contracts v1.0.1 h1:Ts5ob+CoCY2EjEd0W6vdLJ7hLL3
958958
github.com/onflow/flow-ft/lib/go/contracts v1.0.1/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
959959
github.com/onflow/flow-ft/lib/go/templates v1.0.1 h1:FDYKAiGowABtoMNusLuRCILIZDtVqJ/5tYI4VkF5zfM=
960960
github.com/onflow/flow-ft/lib/go/templates v1.0.1/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE=
961-
github.com/onflow/flow-go-sdk v1.9.4 h1:pVbaWHGjTZBePb+pHXNlg5WQsoM2cbR/tbCtr66nydE=
962-
github.com/onflow/flow-go-sdk v1.9.4/go.mod h1:zTrha2lNASm7uHQuhGKq47tEBCV1e38SMsjmuuHauyQ=
961+
github.com/onflow/flow-go-sdk v1.9.5 h1:tvJTa6bA7QDAavwohNysHk1AqFJqXTX8YRbdQpW5HBA=
962+
github.com/onflow/flow-go-sdk v1.9.5/go.mod h1:R6AM8t3GGy3GD6a57bikVcMcVofzovcSfodChnS+j00=
963963
github.com/onflow/flow-nft/lib/go/contracts v1.3.0 h1:DmNop+O0EMyicZvhgdWboFG57xz5t9Qp81FKlfKyqJc=
964964
github.com/onflow/flow-nft/lib/go/contracts v1.3.0/go.mod h1:eZ9VMMNfCq0ho6kV25xJn1kXeCfxnkhj3MwF3ed08gY=
965965
github.com/onflow/flow-nft/lib/go/templates v1.3.0 h1:uGIBy4GEY6Z9hKP7sm5nA5kwvbvLWW4nWx5NN9Wg0II=

‎insecure/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,14 +215,14 @@ require (
215215
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
216216
github.com/olekukonko/tablewriter v0.0.5 // indirect
217217
github.com/onflow/atree v0.12.0 // indirect
218-
github.com/onflow/cadence v1.8.5 // indirect
218+
github.com/onflow/cadence v1.8.6 // indirect
219219
github.com/onflow/fixed-point v0.1.1 // indirect
220220
github.com/onflow/flow-core-contracts/lib/go/contracts v1.9.2 // indirect
221221
github.com/onflow/flow-core-contracts/lib/go/templates v1.9.2 // indirect
222222
github.com/onflow/flow-evm-bridge v0.1.0 // indirect
223223
github.com/onflow/flow-ft/lib/go/contracts v1.0.1 // indirect
224224
github.com/onflow/flow-ft/lib/go/templates v1.0.1 // indirect
225-
github.com/onflow/flow-go-sdk v1.9.4 // indirect
225+
github.com/onflow/flow-go-sdk v1.9.5 // indirect
226226
github.com/onflow/flow-nft/lib/go/contracts v1.3.0 // indirect
227227
github.com/onflow/flow-nft/lib/go/templates v1.3.0 // indirect
228228
github.com/onflow/flow/protobuf/go/flow v0.4.18 // indirect

‎insecure/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -890,8 +890,8 @@ github.com/onflow/atree v0.12.0 h1:X7/UEPyCaaEQ1gCg11KDvfyEtEeQLhtRtxMHjAiH/Co=
890890
github.com/onflow/atree v0.12.0/go.mod h1:qdZcfLQwPirHcNpLiK+2t3KAo+SAb9Si6TqurE6pykE=
891891
github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483 h1:LpiQhTAfM9CAmNVEs0n//cBBgCg+vJSiIxTHYUklZ84=
892892
github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483/go.mod h1:pIZgTWdm3k3pLF9Uq6MB8JEcW07UDwNJjlXW1HELW80=
893-
github.com/onflow/cadence v1.8.5 h1:TLjmXDK01rN542suJQlfaGctztUvbE2zfiqG/OFZie0=
894-
github.com/onflow/cadence v1.8.5/go.mod h1:CWPsQ/IiS6ehhKRArmwN6gtg1v9Z4qJLJubzfdl3X4g=
893+
github.com/onflow/cadence v1.8.6 h1:IrRKAq2JsGTOPaEO0CwtwTgv2qfyOoGyeoCpydFoHNI=
894+
github.com/onflow/cadence v1.8.6/go.mod h1:CWPsQ/IiS6ehhKRArmwN6gtg1v9Z4qJLJubzfdl3X4g=
895895
github.com/onflow/crypto v0.25.3 h1:XQ3HtLsw8h1+pBN+NQ1JYM9mS2mVXTyg55OldaAIF7U=
896896
github.com/onflow/crypto v0.25.3/go.mod h1:+1igaXiK6Tjm9wQOBD1EGwW7bYWMUGKtwKJ/2QL/OWs=
897897
github.com/onflow/fixed-point v0.1.1 h1:j0jYZVO8VGyk1476alGudEg7XqCkeTVxb5ElRJRKS90=
@@ -906,8 +906,8 @@ github.com/onflow/flow-ft/lib/go/contracts v1.0.1 h1:Ts5ob+CoCY2EjEd0W6vdLJ7hLL3
906906
github.com/onflow/flow-ft/lib/go/contracts v1.0.1/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
907907
github.com/onflow/flow-ft/lib/go/templates v1.0.1 h1:FDYKAiGowABtoMNusLuRCILIZDtVqJ/5tYI4VkF5zfM=
908908
github.com/onflow/flow-ft/lib/go/templates v1.0.1/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE=
909-
github.com/onflow/flow-go-sdk v1.9.4 h1:pVbaWHGjTZBePb+pHXNlg5WQsoM2cbR/tbCtr66nydE=
910-
github.com/onflow/flow-go-sdk v1.9.4/go.mod h1:zTrha2lNASm7uHQuhGKq47tEBCV1e38SMsjmuuHauyQ=
909+
github.com/onflow/flow-go-sdk v1.9.5 h1:tvJTa6bA7QDAavwohNysHk1AqFJqXTX8YRbdQpW5HBA=
910+
github.com/onflow/flow-go-sdk v1.9.5/go.mod h1:R6AM8t3GGy3GD6a57bikVcMcVofzovcSfodChnS+j00=
911911
github.com/onflow/flow-nft/lib/go/contracts v1.3.0 h1:DmNop+O0EMyicZvhgdWboFG57xz5t9Qp81FKlfKyqJc=
912912
github.com/onflow/flow-nft/lib/go/contracts v1.3.0/go.mod h1:eZ9VMMNfCq0ho6kV25xJn1kXeCfxnkhj3MwF3ed08gY=
913913
github.com/onflow/flow-nft/lib/go/templates v1.3.0 h1:uGIBy4GEY6Z9hKP7sm5nA5kwvbvLWW4nWx5NN9Wg0II=

‎integration/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ require (
2121
github.com/ipfs/go-datastore v0.8.2
2222
github.com/ipfs/go-ds-pebble v0.5.0
2323
github.com/libp2p/go-libp2p v0.38.2
24-
github.com/onflow/cadence v1.8.5
24+
github.com/onflow/cadence v1.8.6
2525
github.com/onflow/crypto v0.25.3
2626
github.com/onflow/flow v0.4.15
2727
github.com/onflow/flow-core-contracts/lib/go/contracts v1.9.2
2828
github.com/onflow/flow-core-contracts/lib/go/templates v1.9.2
2929
github.com/onflow/flow-go v0.38.0-preview.0.0.20241021221952-af9cd6e99de1
30-
github.com/onflow/flow-go-sdk v1.9.4
30+
github.com/onflow/flow-go-sdk v1.9.5
3131
github.com/onflow/flow-go/insecure v0.0.0-00010101000000-000000000000
3232
github.com/onflow/flow/protobuf/go/flow v0.4.18
3333
github.com/prometheus/client_golang v1.20.5

‎integration/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -764,8 +764,8 @@ github.com/onflow/atree v0.12.0 h1:X7/UEPyCaaEQ1gCg11KDvfyEtEeQLhtRtxMHjAiH/Co=
764764
github.com/onflow/atree v0.12.0/go.mod h1:qdZcfLQwPirHcNpLiK+2t3KAo+SAb9Si6TqurE6pykE=
765765
github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483 h1:LpiQhTAfM9CAmNVEs0n//cBBgCg+vJSiIxTHYUklZ84=
766766
github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483/go.mod h1:pIZgTWdm3k3pLF9Uq6MB8JEcW07UDwNJjlXW1HELW80=
767-
github.com/onflow/cadence v1.8.5 h1:TLjmXDK01rN542suJQlfaGctztUvbE2zfiqG/OFZie0=
768-
github.com/onflow/cadence v1.8.5/go.mod h1:CWPsQ/IiS6ehhKRArmwN6gtg1v9Z4qJLJubzfdl3X4g=
767+
github.com/onflow/cadence v1.8.6 h1:IrRKAq2JsGTOPaEO0CwtwTgv2qfyOoGyeoCpydFoHNI=
768+
github.com/onflow/cadence v1.8.6/go.mod h1:CWPsQ/IiS6ehhKRArmwN6gtg1v9Z4qJLJubzfdl3X4g=
769769
github.com/onflow/crypto v0.25.3 h1:XQ3HtLsw8h1+pBN+NQ1JYM9mS2mVXTyg55OldaAIF7U=
770770
github.com/onflow/crypto v0.25.3/go.mod h1:+1igaXiK6Tjm9wQOBD1EGwW7bYWMUGKtwKJ/2QL/OWs=
771771
github.com/onflow/fixed-point v0.1.1 h1:j0jYZVO8VGyk1476alGudEg7XqCkeTVxb5ElRJRKS90=
@@ -782,8 +782,8 @@ github.com/onflow/flow-ft/lib/go/contracts v1.0.1 h1:Ts5ob+CoCY2EjEd0W6vdLJ7hLL3
782782
github.com/onflow/flow-ft/lib/go/contracts v1.0.1/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
783783
github.com/onflow/flow-ft/lib/go/templates v1.0.1 h1:FDYKAiGowABtoMNusLuRCILIZDtVqJ/5tYI4VkF5zfM=
784784
github.com/onflow/flow-ft/lib/go/templates v1.0.1/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE=
785-
github.com/onflow/flow-go-sdk v1.9.4 h1:pVbaWHGjTZBePb+pHXNlg5WQsoM2cbR/tbCtr66nydE=
786-
github.com/onflow/flow-go-sdk v1.9.4/go.mod h1:zTrha2lNASm7uHQuhGKq47tEBCV1e38SMsjmuuHauyQ=
785+
github.com/onflow/flow-go-sdk v1.9.5 h1:tvJTa6bA7QDAavwohNysHk1AqFJqXTX8YRbdQpW5HBA=
786+
github.com/onflow/flow-go-sdk v1.9.5/go.mod h1:R6AM8t3GGy3GD6a57bikVcMcVofzovcSfodChnS+j00=
787787
github.com/onflow/flow-nft/lib/go/contracts v1.3.0 h1:DmNop+O0EMyicZvhgdWboFG57xz5t9Qp81FKlfKyqJc=
788788
github.com/onflow/flow-nft/lib/go/contracts v1.3.0/go.mod h1:eZ9VMMNfCq0ho6kV25xJn1kXeCfxnkhj3MwF3ed08gY=
789789
github.com/onflow/flow-nft/lib/go/templates v1.3.0 h1:uGIBy4GEY6Z9hKP7sm5nA5kwvbvLWW4nWx5NN9Wg0II=

‎utils/unittest/execution_state.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const ServiceAccountPrivateKeySignAlgo = crypto.ECDSAP256
2323
const ServiceAccountPrivateKeyHashAlgo = hash.SHA2_256
2424

2525
// Pre-calculated state commitment with root account with the above private key
26-
const GenesisStateCommitmentHex = "78d704954cb4c058e98defc406d8979613d14c33afa462fa86f5805692cc71a0"
26+
const GenesisStateCommitmentHex = "b23ecbd2c3978ac25d7e8715eda129cae7b14d9a74f8d57540cb78394ef6d9e7"
2727

2828
var GenesisStateCommitment flow.StateCommitment
2929

@@ -87,10 +87,10 @@ func genesisCommitHexByChainID(chainID flow.ChainID) string {
8787
return GenesisStateCommitmentHex
8888
}
8989
if chainID == flow.Testnet {
90-
return "b785b3d48e9af817deddd18020c47291c1c583efab5adf0c6b102850b95ca8e6"
90+
return "d19068fda1c0f015020ef3a48ef3a789ba879b99d1e40d8fbf47f156b49917cc"
9191
}
9292
if chainID == flow.Sandboxnet {
9393
return "e1c08b17f9e5896f03fe28dd37ca396c19b26628161506924fbf785834646ea1"
9494
}
95-
return "c43c9654c5ff3db601373d68243c4bca79303c75ce89ae8c4d3866615800a23a"
95+
return "acf5c0f522697f54e8de9d31ccc4bddc860d3990474b19f44c994f1daf86d588"
9696
}

0 commit comments

Comments
 (0)