Skip to content

Commit 3285cc1

Browse files
j1010001j1010001
authored
Merge pull request #7905 from onflow/josh/update-cc
Update to core contracts 1.8.1
2 parents 056355e + ac0fbb8 commit 3285cc1

File tree

8 files changed

+23
-23
lines changed

8 files changed

+23
-23
lines changed

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

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

5959
func TestBootstrapLedger_ZeroTokenSupply(t *testing.T) {
60-
expectedStateCommitmentBytes, _ := hex.DecodeString("d663a99bf30646bf3cd770bd19ce96c43f6da658a0928ea67a433beb106fae4f")
60+
expectedStateCommitmentBytes, _ := hex.DecodeString("bc3daf8c462869759ffb7ced651d6c6a552a9df7c1268b3b8e6a9804260ab1c6")
6161
expectedStateCommitment, err := flow.ToStateCommitment(expectedStateCommitmentBytes)
6262
require.NoError(t, err)
6363

@@ -104,7 +104,7 @@ func TestBootstrapLedger_ZeroTokenSupply(t *testing.T) {
104104
// - transaction fee deduction
105105
// This tests that the state commitment has not changed for the bookkeeping parts of the transaction.
106106
func TestBootstrapLedger_EmptyTransaction(t *testing.T) {
107-
expectedStateCommitmentBytes, _ := hex.DecodeString("231e6e9c2cce27d0a9d2a47f5991ae934ee3eb3336534316c52719f511d46abb")
107+
expectedStateCommitmentBytes, _ := hex.DecodeString("85721a09e89b6b3bb5d064fa11da035b9dca4edb6f881c1e9a263da4176b7df8")
108108
expectedStateCommitment, err := flow.ToStateCommitment(expectedStateCommitmentBytes)
109109
require.NoError(t, err)
110110

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ require (
5050
github.com/onflow/cadence v1.7.0
5151
github.com/onflow/crypto v0.25.3
5252
github.com/onflow/flow v0.4.15
53-
github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.0
54-
github.com/onflow/flow-core-contracts/lib/go/templates v1.8.0
53+
github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.1
54+
github.com/onflow/flow-core-contracts/lib/go/templates v1.8.1
5555
github.com/onflow/flow-go-sdk v1.8.1
5656
github.com/onflow/flow/protobuf/go/flow v0.4.15
5757
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -945,10 +945,10 @@ github.com/onflow/fixed-point v0.1.1 h1:j0jYZVO8VGyk1476alGudEg7XqCkeTVxb5ElRJRK
945945
github.com/onflow/fixed-point v0.1.1/go.mod h1:gJdoHqKtToKdOZbvryJvDZfcpzC7d2fyWuo3ZmLtcGY=
946946
github.com/onflow/flow v0.4.15 h1:MdrhULSE5iSYNyLCihH8DI4uab5VciVZUKDFON6zylY=
947947
github.com/onflow/flow v0.4.15/go.mod h1:lzyAYmbu1HfkZ9cfnL5/sjrrsnJiUU8fRL26CqLP7+c=
948-
github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.0 h1:Kq6MRKwmHfoTTDty/Ib7is1peaSMBQ2GHcnhDgsRH4c=
949-
github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.0/go.mod h1:h15J7unHnlTARjudbb0m5KO3EoHIucoBgShAqE6NoNA=
950-
github.com/onflow/flow-core-contracts/lib/go/templates v1.8.0 h1:vcCIJP8vYuo0t77Hbxh2IEpGSZoEudB58Qpci11LSCE=
951-
github.com/onflow/flow-core-contracts/lib/go/templates v1.8.0/go.mod h1:twSVyUt3rNrgzAmxtBX+1Gw64QlPemy17cyvnXYy1Ug=
948+
github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.1 h1:WU0s/4TCiJ+HMMc6RAsmSzPc/O7PecDVbugyHYHEaZQ=
949+
github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.1/go.mod h1:h15J7unHnlTARjudbb0m5KO3EoHIucoBgShAqE6NoNA=
950+
github.com/onflow/flow-core-contracts/lib/go/templates v1.8.1 h1:l/sPH4Ki0Td4sB1ybKhVKHFq7ciiUcadV5RULXJl+wE=
951+
github.com/onflow/flow-core-contracts/lib/go/templates v1.8.1/go.mod h1:twSVyUt3rNrgzAmxtBX+1Gw64QlPemy17cyvnXYy1Ug=
952952
github.com/onflow/flow-evm-bridge v0.1.0 h1:7X2osvo4NnQgHj8aERUmbYtv9FateX8liotoLnPL9nM=
953953
github.com/onflow/flow-evm-bridge v0.1.0/go.mod h1:5UYwsnu6WcBNrwitGFxphCl5yq7fbWYGYuiCSTVF6pk=
954954
github.com/onflow/flow-ft/lib/go/contracts v1.0.1 h1:Ts5ob+CoCY2EjEd0W6vdLJ7hLL3SsEftzXG2JlmSe24=

‎insecure/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ require (
215215
github.com/onflow/atree v0.10.1 // indirect
216216
github.com/onflow/cadence v1.7.0 // indirect
217217
github.com/onflow/fixed-point v0.1.1 // indirect
218-
github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.0 // indirect
219-
github.com/onflow/flow-core-contracts/lib/go/templates v1.8.0 // indirect
218+
github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.1 // indirect
219+
github.com/onflow/flow-core-contracts/lib/go/templates v1.8.1 // indirect
220220
github.com/onflow/flow-evm-bridge v0.1.0 // indirect
221221
github.com/onflow/flow-ft/lib/go/contracts v1.0.1 // indirect
222222
github.com/onflow/flow-ft/lib/go/templates v1.0.1 // indirect

‎insecure/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -893,10 +893,10 @@ github.com/onflow/crypto v0.25.3 h1:XQ3HtLsw8h1+pBN+NQ1JYM9mS2mVXTyg55OldaAIF7U=
893893
github.com/onflow/crypto v0.25.3/go.mod h1:+1igaXiK6Tjm9wQOBD1EGwW7bYWMUGKtwKJ/2QL/OWs=
894894
github.com/onflow/fixed-point v0.1.1 h1:j0jYZVO8VGyk1476alGudEg7XqCkeTVxb5ElRJRKS90=
895895
github.com/onflow/fixed-point v0.1.1/go.mod h1:gJdoHqKtToKdOZbvryJvDZfcpzC7d2fyWuo3ZmLtcGY=
896-
github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.0 h1:Kq6MRKwmHfoTTDty/Ib7is1peaSMBQ2GHcnhDgsRH4c=
897-
github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.0/go.mod h1:h15J7unHnlTARjudbb0m5KO3EoHIucoBgShAqE6NoNA=
898-
github.com/onflow/flow-core-contracts/lib/go/templates v1.8.0 h1:vcCIJP8vYuo0t77Hbxh2IEpGSZoEudB58Qpci11LSCE=
899-
github.com/onflow/flow-core-contracts/lib/go/templates v1.8.0/go.mod h1:twSVyUt3rNrgzAmxtBX+1Gw64QlPemy17cyvnXYy1Ug=
896+
github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.1 h1:WU0s/4TCiJ+HMMc6RAsmSzPc/O7PecDVbugyHYHEaZQ=
897+
github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.1/go.mod h1:h15J7unHnlTARjudbb0m5KO3EoHIucoBgShAqE6NoNA=
898+
github.com/onflow/flow-core-contracts/lib/go/templates v1.8.1 h1:l/sPH4Ki0Td4sB1ybKhVKHFq7ciiUcadV5RULXJl+wE=
899+
github.com/onflow/flow-core-contracts/lib/go/templates v1.8.1/go.mod h1:twSVyUt3rNrgzAmxtBX+1Gw64QlPemy17cyvnXYy1Ug=
900900
github.com/onflow/flow-evm-bridge v0.1.0 h1:7X2osvo4NnQgHj8aERUmbYtv9FateX8liotoLnPL9nM=
901901
github.com/onflow/flow-evm-bridge v0.1.0/go.mod h1:5UYwsnu6WcBNrwitGFxphCl5yq7fbWYGYuiCSTVF6pk=
902902
github.com/onflow/flow-ft/lib/go/contracts v1.0.1 h1:Ts5ob+CoCY2EjEd0W6vdLJ7hLL3SsEftzXG2JlmSe24=

‎integration/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ require (
2222
github.com/libp2p/go-libp2p v0.38.2
2323
github.com/onflow/cadence v1.7.0
2424
github.com/onflow/crypto v0.25.3
25-
github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.0
26-
github.com/onflow/flow-core-contracts/lib/go/templates v1.8.0
25+
github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.1
26+
github.com/onflow/flow-core-contracts/lib/go/templates v1.8.1
2727
github.com/onflow/flow-go v0.38.0-preview.0.0.20241021221952-af9cd6e99de1
2828
github.com/onflow/flow-go-sdk v1.8.1
2929
github.com/onflow/flow-go/insecure v0.0.0-00010101000000-000000000000

‎integration/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -765,10 +765,10 @@ github.com/onflow/crypto v0.25.3 h1:XQ3HtLsw8h1+pBN+NQ1JYM9mS2mVXTyg55OldaAIF7U=
765765
github.com/onflow/crypto v0.25.3/go.mod h1:+1igaXiK6Tjm9wQOBD1EGwW7bYWMUGKtwKJ/2QL/OWs=
766766
github.com/onflow/fixed-point v0.1.1 h1:j0jYZVO8VGyk1476alGudEg7XqCkeTVxb5ElRJRKS90=
767767
github.com/onflow/fixed-point v0.1.1/go.mod h1:gJdoHqKtToKdOZbvryJvDZfcpzC7d2fyWuo3ZmLtcGY=
768-
github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.0 h1:Kq6MRKwmHfoTTDty/Ib7is1peaSMBQ2GHcnhDgsRH4c=
769-
github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.0/go.mod h1:h15J7unHnlTARjudbb0m5KO3EoHIucoBgShAqE6NoNA=
770-
github.com/onflow/flow-core-contracts/lib/go/templates v1.8.0 h1:vcCIJP8vYuo0t77Hbxh2IEpGSZoEudB58Qpci11LSCE=
771-
github.com/onflow/flow-core-contracts/lib/go/templates v1.8.0/go.mod h1:twSVyUt3rNrgzAmxtBX+1Gw64QlPemy17cyvnXYy1Ug=
768+
github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.1 h1:WU0s/4TCiJ+HMMc6RAsmSzPc/O7PecDVbugyHYHEaZQ=
769+
github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.1/go.mod h1:h15J7unHnlTARjudbb0m5KO3EoHIucoBgShAqE6NoNA=
770+
github.com/onflow/flow-core-contracts/lib/go/templates v1.8.1 h1:l/sPH4Ki0Td4sB1ybKhVKHFq7ciiUcadV5RULXJl+wE=
771+
github.com/onflow/flow-core-contracts/lib/go/templates v1.8.1/go.mod h1:twSVyUt3rNrgzAmxtBX+1Gw64QlPemy17cyvnXYy1Ug=
772772
github.com/onflow/flow-evm-bridge v0.1.0 h1:7X2osvo4NnQgHj8aERUmbYtv9FateX8liotoLnPL9nM=
773773
github.com/onflow/flow-evm-bridge v0.1.0/go.mod h1:5UYwsnu6WcBNrwitGFxphCl5yq7fbWYGYuiCSTVF6pk=
774774
github.com/onflow/flow-ft/lib/go/contracts v1.0.1 h1:Ts5ob+CoCY2EjEd0W6vdLJ7hLL3SsEftzXG2JlmSe24=

‎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 = "76cb65efe14c63df5097151518e2f7dbd110d284a5c2bf4f66f84f4c992bd0d5"
26+
const GenesisStateCommitmentHex = "1cbc19eb4f541a487a337f790da34cf12a71cfeca65f98a5c60c69e118f5387e"
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 "b0d6a4288eb4749072c5c95c79c87842dfa45242f9cd6b05b802fc52cbd64ccf"
90+
return "95c2187b816a86229ece77c089de5a2ad725f1e3d85ece4d1582a7238b80daca"
9191
}
9292
if chainID == flow.Sandboxnet {
9393
return "e1c08b17f9e5896f03fe28dd37ca396c19b26628161506924fbf785834646ea1"
9494
}
95-
return "8c29b11c0c98b58db80ee0772dfc0cff91e552aa930231d5235e1ff6800ce571"
95+
return "42c5d929561c498210a94ba23bd2dd7d13412345fd45c9d0bd3f8312ae9dddd7"
9696
}

0 commit comments

Comments
 (0)