Merge pull request #5579 from onflow/janez/stable-cadence-update-cc

Update Core Contracts
onflow · Mar 26, 2024 · 602900f · 602900f
2 parents a21d52b + 43e71d8
commit 602900f
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 22 deletions.
diff --git a/engine/execution/state/bootstrap/bootstrap_test.go b/engine/execution/state/bootstrap/bootstrap_test.go
@@ -53,7 +53,7 @@ func TestBootstrapLedger(t *testing.T) {
 }
 
 func TestBootstrapLedger_ZeroTokenSupply(t *testing.T) {
-	expectedStateCommitmentBytes, _ := hex.DecodeString("ef4d7cf4a852985e51bac9fefce8a04aa885fa716cc73814242ce55b51347e82")
+	expectedStateCommitmentBytes, _ := hex.DecodeString("441ce1468c2ce5e10e642629ee90ea82dfa2695795a1678adfa8ccc48d9f4c51")
 	expectedStateCommitment, err := flow.ToStateCommitment(expectedStateCommitmentBytes)
 	require.NoError(t, err)
 

diff --git a/go.mod b/go.mod
@@ -54,8 +54,8 @@ require (
 	github.com/onflow/cadence v1.0.0-preview.16
 	github.com/onflow/crypto v0.25.0
 	github.com/onflow/flow v0.3.4
-	github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240305214031-d81e0c3b42f3
-	github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240305214031-d81e0c3b42f3
+	github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240322152746-bcf77eeccc0f
+	github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240322152746-bcf77eeccc0f
 	github.com/onflow/flow-go-sdk v1.0.0-preview.14
 	github.com/onflow/flow/protobuf/go/flow v0.3.7
 	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58

diff --git a/go.sum b/go.sum
@@ -2494,10 +2494,10 @@ github.com/onflow/crypto v0.25.0 h1:BeWbLsh3ZD13Ej+Uky6kg1PL1ZIVBDVX+2MVBNwqddg=
 github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
 github.com/onflow/flow v0.3.4 h1:FXUWVdYB90f/rjNcY0Owo30gL790tiYff9Pb/sycXYE=
 github.com/onflow/flow v0.3.4/go.mod h1:lzyAYmbu1HfkZ9cfnL5/sjrrsnJiUU8fRL26CqLP7+c=
-github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240305214031-d81e0c3b42f3 h1:UNLms46HthnzKTR3DVQmEoDerf4EtNUMfkombIeT3U8=
-github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240305214031-d81e0c3b42f3/go.mod h1:ROB3X1QhobsVj3ZqSn8fy8gX2pXL8tHNUC+jZUCWpnA=
-github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240305214031-d81e0c3b42f3 h1:svq9+OKnCdIm6ePR6i/laXtg5kP7XHGsHUpsYevPIJ4=
-github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240305214031-d81e0c3b42f3/go.mod h1:Ka6dexQbB/5R64cpfA9KZQ7V0pqqHNS5T3G3wftaQVw=
+github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240322152746-bcf77eeccc0f h1:qUMgAain7WqibdCCXfWUsiMvewERYYc1wZzF7FB4fMk=
+github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240322152746-bcf77eeccc0f/go.mod h1:ROB3X1QhobsVj3ZqSn8fy8gX2pXL8tHNUC+jZUCWpnA=
+github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240322152746-bcf77eeccc0f h1:R/PIishBoH5LZ/bs382iJStMMWN8jgu2uy7aJExvLyM=
+github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240322152746-bcf77eeccc0f/go.mod h1:Ka6dexQbB/5R64cpfA9KZQ7V0pqqHNS5T3G3wftaQVw=
 github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20240305212555-29d91e18f0c1 h1:1hTH+Y8EB8BZ0hXsrxZqSTDWoY0euFT/IzXxlgVQok4=
 github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20240305212555-29d91e18f0c1/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
 github.com/onflow/flow-ft/lib/go/templates v0.7.1-0.20240305212555-29d91e18f0c1 h1:7BkqJ21EQAbYCZqLj2xCIqJvhrHNCXe9BfLTEiQqIx0=

diff --git a/insecure/go.mod b/insecure/go.mod
@@ -206,8 +206,8 @@ require (
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/onflow/atree v0.6.1-0.20240308163425-dc825c20b1a2 // indirect
 	github.com/onflow/cadence v1.0.0-preview.16 // indirect
-	github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240305214031-d81e0c3b42f3 // indirect
-	github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240305214031-d81e0c3b42f3 // indirect
+	github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240322152746-bcf77eeccc0f // indirect
+	github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240322152746-bcf77eeccc0f // indirect
 	github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20240305212555-29d91e18f0c1 // indirect
 	github.com/onflow/flow-ft/lib/go/templates v0.7.1-0.20240305212555-29d91e18f0c1 // indirect
 	github.com/onflow/flow-go-sdk v1.0.0-preview.14 // indirect

diff --git a/insecure/go.sum b/insecure/go.sum
@@ -2477,10 +2477,10 @@ github.com/onflow/cadence v1.0.0-preview.16 h1:Pu/e7Z1P2nWn+T8/bAcolBS/0JWledYYl
 github.com/onflow/cadence v1.0.0-preview.16/go.mod h1:no8+e5V51B9mgfi4U9xdeH+GxcJdoKKDP9gdxEj9Jdg=
 github.com/onflow/crypto v0.25.0 h1:BeWbLsh3ZD13Ej+Uky6kg1PL1ZIVBDVX+2MVBNwqddg=
 github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
-github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240305214031-d81e0c3b42f3 h1:UNLms46HthnzKTR3DVQmEoDerf4EtNUMfkombIeT3U8=
-github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240305214031-d81e0c3b42f3/go.mod h1:ROB3X1QhobsVj3ZqSn8fy8gX2pXL8tHNUC+jZUCWpnA=
-github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240305214031-d81e0c3b42f3 h1:svq9+OKnCdIm6ePR6i/laXtg5kP7XHGsHUpsYevPIJ4=
-github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240305214031-d81e0c3b42f3/go.mod h1:Ka6dexQbB/5R64cpfA9KZQ7V0pqqHNS5T3G3wftaQVw=
+github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240322152746-bcf77eeccc0f h1:qUMgAain7WqibdCCXfWUsiMvewERYYc1wZzF7FB4fMk=
+github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240322152746-bcf77eeccc0f/go.mod h1:ROB3X1QhobsVj3ZqSn8fy8gX2pXL8tHNUC+jZUCWpnA=
+github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240322152746-bcf77eeccc0f h1:R/PIishBoH5LZ/bs382iJStMMWN8jgu2uy7aJExvLyM=
+github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240322152746-bcf77eeccc0f/go.mod h1:Ka6dexQbB/5R64cpfA9KZQ7V0pqqHNS5T3G3wftaQVw=
 github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20240305212555-29d91e18f0c1 h1:1hTH+Y8EB8BZ0hXsrxZqSTDWoY0euFT/IzXxlgVQok4=
 github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20240305212555-29d91e18f0c1/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
 github.com/onflow/flow-ft/lib/go/templates v0.7.1-0.20240305212555-29d91e18f0c1 h1:7BkqJ21EQAbYCZqLj2xCIqJvhrHNCXe9BfLTEiQqIx0=

diff --git a/integration/go.mod b/integration/go.mod
@@ -23,8 +23,8 @@ require (
 	github.com/libp2p/go-libp2p v0.32.2
 	github.com/onflow/cadence v1.0.0-preview.16
 	github.com/onflow/crypto v0.25.0
-	github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240305214031-d81e0c3b42f3
-	github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240305214031-d81e0c3b42f3
+	github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240322152746-bcf77eeccc0f
+	github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240322152746-bcf77eeccc0f
 	github.com/onflow/flow-emulator v1.0.0-M7.0.20240227020422-2ec59747f9be
 	github.com/onflow/flow-go v0.34.0-crescendo-preview.2.0.20240227001756-cb6311412b78
 	github.com/onflow/flow-go-sdk v1.0.0-preview.14

diff --git a/integration/go.sum b/integration/go.sum
@@ -2553,10 +2553,10 @@ github.com/onflow/cadence v1.0.0-preview.16 h1:Pu/e7Z1P2nWn+T8/bAcolBS/0JWledYYl
 github.com/onflow/cadence v1.0.0-preview.16/go.mod h1:no8+e5V51B9mgfi4U9xdeH+GxcJdoKKDP9gdxEj9Jdg=
 github.com/onflow/crypto v0.25.0 h1:BeWbLsh3ZD13Ej+Uky6kg1PL1ZIVBDVX+2MVBNwqddg=
 github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
-github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240305214031-d81e0c3b42f3 h1:UNLms46HthnzKTR3DVQmEoDerf4EtNUMfkombIeT3U8=
-github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240305214031-d81e0c3b42f3/go.mod h1:ROB3X1QhobsVj3ZqSn8fy8gX2pXL8tHNUC+jZUCWpnA=
-github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240305214031-d81e0c3b42f3 h1:svq9+OKnCdIm6ePR6i/laXtg5kP7XHGsHUpsYevPIJ4=
-github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240305214031-d81e0c3b42f3/go.mod h1:Ka6dexQbB/5R64cpfA9KZQ7V0pqqHNS5T3G3wftaQVw=
+github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240322152746-bcf77eeccc0f h1:qUMgAain7WqibdCCXfWUsiMvewERYYc1wZzF7FB4fMk=
+github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240322152746-bcf77eeccc0f/go.mod h1:ROB3X1QhobsVj3ZqSn8fy8gX2pXL8tHNUC+jZUCWpnA=
+github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240322152746-bcf77eeccc0f h1:R/PIishBoH5LZ/bs382iJStMMWN8jgu2uy7aJExvLyM=
+github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240322152746-bcf77eeccc0f/go.mod h1:Ka6dexQbB/5R64cpfA9KZQ7V0pqqHNS5T3G3wftaQVw=
 github.com/onflow/flow-emulator v1.0.0-M7.0.20240227020422-2ec59747f9be h1:n6Zi/9uRQhI9Lpzi87tozuOzuV9KZhUGI7QI7H4LnMc=
 github.com/onflow/flow-emulator v1.0.0-M7.0.20240227020422-2ec59747f9be/go.mod h1:lr5R66ZAhCaXnotdyXe0iI7bi8s/cIM/4mu0if2JXEQ=
 github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20240305212555-29d91e18f0c1 h1:1hTH+Y8EB8BZ0hXsrxZqSTDWoY0euFT/IzXxlgVQok4=

diff --git a/utils/unittest/execution_state.go b/utils/unittest/execution_state.go
@@ -23,7 +23,7 @@ const ServiceAccountPrivateKeySignAlgo = crypto.ECDSAP256
 const ServiceAccountPrivateKeyHashAlgo = hash.SHA2_256
 
 // Pre-calculated state commitment with root account with the above private key
-const GenesisStateCommitmentHex = "16dae2cbbf05691bad867549881dd01958350709df64e45481d8b235389c28ab"
+const GenesisStateCommitmentHex = "2c56f8d58776f7c394598d1cbb41764cd76d5f46672489ec9d380b5c6455ef8c"
 
 var GenesisStateCommitment flow.StateCommitment
 
@@ -87,10 +87,10 @@ func genesisCommitHexByChainID(chainID flow.ChainID) string {
 		return GenesisStateCommitmentHex
 	}
 	if chainID == flow.Testnet {
-		return "bedd5fcc349f9a758e6854a42ab7481b465a69e6a51e29e7f4f6d980aade9ac2"
+		return "76dfe98ad473fb94346e958737c6fc5deb72d4146250c15a49d055e1a9fe8572"
 	}
 	if chainID == flow.Sandboxnet {
 		return "e1c08b17f9e5896f03fe28dd37ca396c19b26628161506924fbf785834646ea1"
 	}
-	return "7148c32b2fa1f5c9baecb0823ea68d84fece1852c95ad9c0927a50f17fb0ff13"
+	return "0d52fe24e197658039423a19d73a32045fc5b40bae8856027ada4c0a7777f87e"
 }