Skip to content

Commit 7c19ce4

Browse files
committed
revert whitespace change in EVM contract, restore expected state commitments to values from master
1 parent 5baa47d commit 7c19ce4

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

engine/execution/state/bootstrap/bootstrap_test.go

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

5959
func TestBootstrapLedger_ZeroTokenSupply(t *testing.T) {
6060
expectedStateCommitmentBytes, _ := hex.DecodeString(
61-
"114c3c6747c0ecdb6f1aaba9278e261e2883d40c0ec917aacc53a6bfaca4c28f",
61+
"9b45ac2b9e1e04fd57761d551110d988c1737855d17f2f540c4b6c79c4b5058e",
6262
)
6363
expectedStateCommitment, err := flow.ToStateCommitment(expectedStateCommitmentBytes)
6464
require.NoError(t, err)
@@ -107,7 +107,7 @@ func TestBootstrapLedger_ZeroTokenSupply(t *testing.T) {
107107
// This tests that the state commitment has not changed for the bookkeeping parts of the transaction.
108108
func TestBootstrapLedger_EmptyTransaction(t *testing.T) {
109109
expectedStateCommitmentBytes, _ := hex.DecodeString(
110-
"26c1eb39af9ba9708b49d1149d9fb7ee2a5ab870793c67da0b4bd7c48f0cca33",
110+
"52ca1f4d53adc9ff018f10473a8bd02b4dc9baf5ab04bc1ac0fbb5b40e780d83",
111111
)
112112
expectedStateCommitment, err := flow.ToStateCommitment(expectedStateCommitmentBytes)
113113
require.NoError(t, err)

fvm/evm/stdlib/contract.cdc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -401,9 +401,9 @@ access(all) contract EVM {
401401
}
402402
}
403403

404-
/*
405-
Cadence-Owned Accounts (COA)
406-
A COA is a natively supported EVM smart contract wallet type
404+
/*
405+
Cadence-Owned Accounts (COA)
406+
A COA is a natively supported EVM smart contract wallet type
407407
that allows a Cadence resource to own and control an EVM address.
408408
This native wallet provides the primitives needed to bridge
409409
or control assets across Flow EVM and Cadence.
@@ -973,7 +973,7 @@ access(all) contract EVM {
973973
/// Sets the BridgeAccessor Capability in the BridgeRouter
974974
access(Bridge) fun setBridgeAccessor(_ accessor: Capability<auth(Bridge) &{BridgeAccessor}>) {
975975
pre {
976-
accessor.check():
976+
accessor.check():
977977
"EVM.setBridgeAccessor(): Invalid BridgeAccessor Capability provided"
978978
emit BridgeAccessorUpdated(
979979
routerType: self.getType(),

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 = "8a96fa1630db32bafd997262ddf5baf10cbc7745b6bc4f544970fcbc4675c6cd"
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 "f5ba39ea58aa8cd335d221d8e12083430a6a39f541ef34cb5a874f1af172f1b3"
90+
return "d19068fda1c0f015020ef3a48ef3a789ba879b99d1e40d8fbf47f156b49917cc"
9191
}
9292
if chainID == flow.Sandboxnet {
9393
return "e1c08b17f9e5896f03fe28dd37ca396c19b26628161506924fbf785834646ea1"
9494
}
95-
return "a6005c6798453f229a5ecaeb2205dc7dfa118535cd86ddbd8130a48fc70c651d"
95+
return "acf5c0f522697f54e8de9d31ccc4bddc860d3990474b19f44c994f1daf86d588"
9696
}

0 commit comments

Comments
 (0)