Update Stable Cadence feature branch #5412
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[Flow EVM] update error handling
[Networking] Adds GossipSub RPC inspection documentation
[Flow EVM] Fix block hash calculation
[Flow EVM] Add tests to assert that Flow EVM events can be properly CCF encoded/decoded
|
@onflow/flow-execution-and-verification |
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## feature/stable-cadence #5412 +/- ##
==========================================================
- Coverage 56.35% 56.31% -0.04%
==========================================================
Files 1029 1023 -6
Lines 99604 99105 -499
==========================================================
- Hits 56131 55814 -317
+ Misses 39256 39069 -187
- Partials 4217 4222 +5
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
ramtinms
approved these changes
Feb 17, 2024
janezpodhostnik
approved these changes
Feb 20, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Work towards onflow/cadence#3115
Conflict resolution
commit c111805fa03d7d47644e7d28351dde0299014283 Merge: 33b37f1229 6976a4d55a Author: Bastian Müller <bastian@turbolent.com> Date: Sat Feb 17 13:55:47 2024 -0800 Merge branch 'master' into bastian/update-stable-cadence-10 diff --git a/fvm/evm/evm_test.go b/fvm/evm/evm_test.go remerge CONFLICT (content): Merge conflict in fvm/evm/evm_test.go index b4fcfeea16..a639d2c243 100644 --- a/fvm/evm/evm_test.go +++ b/fvm/evm/evm_test.go @@ -329,26 +329,17 @@ func TestCadenceArch(t *testing.T) { import EVM from %s transaction { -<<<<<<< 33b37f1229 (Merge pull request #5400 from onflow/supun/sync-stable-cadence-master) prepare(account: auth(Capabilities, SaveValue) &Account) { - let bridgedAccount1 <- EVM.createBridgedAccount() + let cadenceOwnedAccount <- EVM.createCadenceOwnedAccount() - account.storage.save<@EVM.BridgedAccount>( - <-bridgedAccount1, - to: /storage/bridgedAccount + account.storage.save( + <-cadenceOwnedAccount, + to: /storage/coa ) - let bridgedAccount = account.capabilities.storage - .issue<&EVM.BridgedAccount>(/storage/bridgedAccount) - account.capabilities.publish(bridgedAccount, at: /public/bridgedAccount) -======= - prepare(account: AuthAccount) { - let cadenceOwnedAccount1 <- EVM.createCadenceOwnedAccount() - account.save<@EVM.CadenceOwnedAccount>(<-cadenceOwnedAccount1, - to: /storage/coa) - account.link<&EVM.CadenceOwnedAccount{EVM.Addressable}>(/public/coa, - target: /storage/coa) ->>>>>>> 6976a4d55a (Merge pull request #5381 from onflow/ramtin/5380-rename-bridge-account) + let cap = account.capabilities.storage + .issue<&EVM.CadenceOwnedAccount>(/storage/coa) + account.capabilities.publish(cap, at: /public/coa) } } `, diff --git a/fvm/evm/stdlib/contract.cdc b/fvm/evm/stdlib/contract.cdc remerge CONFLICT (content): Merge conflict in fvm/evm/stdlib/contract.cdc index 1bc43e48ea..fa383ee9bd 100644 --- a/fvm/evm/stdlib/contract.cdc +++ b/fvm/evm/stdlib/contract.cdc @@ -4,12 +4,8 @@ import "FlowToken" access(all) contract EVM { -<<<<<<< 33b37f1229 (Merge pull request #5400 from onflow/supun/sync-stable-cadence-master) access(all) - event BridgedAccountCreated(addressBytes: [UInt8; 20]) -======= - pub event CadenceOwnedAccountCreated(addressBytes: [UInt8; 20]) ->>>>>>> 6976a4d55a (Merge pull request #5381 from onflow/ramtin/5380-rename-bridge-account) + event CadenceOwnedAccountCreated(addressBytes: [UInt8; 20]) /// EVMAddress is an EVM-compatible address access(all) @@ -286,14 +282,8 @@ contract EVM { ) assert(isValid, message: "signatures not valid") -<<<<<<< 33b37f1229 (Merge pull request #5400 from onflow/supun/sync-stable-cadence-master) - let coaRef = acc.capabilities.borrow<&EVM.BridgedAccount>(path) - ?? panic("could not borrow bridge account's address") -======= - let coaRef = acc.getCapability(path) - .borrow<&EVM.CadenceOwnedAccount{EVM.Addressable}>() - ?? panic("could not borrow coa resource addressable capability") ->>>>>>> 6976a4d55a (Merge pull request #5381 from onflow/ramtin/5380-rename-bridge-account) + let coaRef = acc.capabilities.borrow<&EVM.CadenceOwnedAccount>(path) + ?? panic("could not borrow Cadence-owned account's address") // verify evm address matching var i = 0 diff --git a/fvm/evm/stdlib/contract_test.go b/fvm/evm/stdlib/contract_test.go remerge CONFLICT (content): Merge conflict in fvm/evm/stdlib/contract_test.go index 5adbbe16f5..9071b155bc 100644 --- a/fvm/evm/stdlib/contract_test.go +++ b/fvm/evm/stdlib/contract_test.go @@ -3021,13 +3021,8 @@ func TestCadenceOwnedAccountCall(t *testing.T) { access(all) fun main(): [UInt8] { -<<<<<<< 33b37f1229 (Merge pull request #5400 from onflow/supun/sync-stable-cadence-master) - let bridgedAccount <- EVM.createBridgedAccount() - let bal = EVM.Balance(attoflow: 0) -======= let cadenceOwnedAccount <- EVM.createCadenceOwnedAccount() - let bal = EVM.Balance(0) ->>>>>>> 6976a4d55a (Merge pull request #5381 from onflow/ramtin/5380-rename-bridge-account) + let bal = EVM.Balance(attoflow: 0) bal.setFLOW(flow: 1.23) let response = cadenceOwnedAccount.call( to: EVM.EVMAddress( @@ -3780,26 +3775,17 @@ func TestEVMValidateCOAOwnershipProof(t *testing.T) { import EVM from 0x1 transaction { -<<<<<<< 33b37f1229 (Merge pull request #5400 from onflow/supun/sync-stable-cadence-master) prepare(account: auth(Capabilities, SaveValue) &Account) { - let bridgedAccount1 <- EVM.createBridgedAccount() + let cadenceOwnedAccount <- EVM.createCadenceOwnedAccount() - account.storage.save<@EVM.BridgedAccount>( - <-bridgedAccount1, - to: /storage/bridgedAccount + account.storage.save( + <-cadenceOwnedAccount, + to: /storage/coa ) - let bridgedAccount = account.capabilities.storage - .issue<&EVM.BridgedAccount>(/storage/bridgedAccount) - account.capabilities.publish(bridgedAccount, at: /public/bridgedAccount) -======= - prepare(account: AuthAccount) { - let cadenceOwnedAccount1 <- EVM.createCadenceOwnedAccount() - account.save<@EVM.CadenceOwnedAccount>(<-cadenceOwnedAccount1, - to: /storage/coa) - account.link<&EVM.CadenceOwnedAccount{EVM.Addressable}>(/public/coa, - target: /storage/coa) ->>>>>>> 6976a4d55a (Merge pull request #5381 from onflow/ramtin/5380-rename-bridge-account) + let cap = account.capabilities.storage + .issue<&EVM.CadenceOwnedAccount>(/storage/coa) + account.capabilities.publish(cap, at: /public/coa) } }`) diff --git a/fvm/evm/types/events.go b/fvm/evm/types/events.go remerge CONFLICT (content): Merge conflict in fvm/evm/types/events.go index 686d1bbb60..606fa74312 100644 --- a/fvm/evm/types/events.go +++ b/fvm/evm/types/events.go @@ -119,28 +119,16 @@ func (p *TransactionExecutedPayload) CadenceEvent() (cadence.Event, error) { EVMLocation{}, string(EventTypeTransactionExecuted), []cadence.Field{ -<<<<<<< 33b37f1229 (Merge pull request #5400 from onflow/supun/sync-stable-cadence-master) cadence.NewField("blockHeight", cadence.UInt64Type), cadence.NewField("transactionHash", cadence.StringType), cadence.NewField("transaction", cadence.StringType), cadence.NewField("failed", cadence.BoolType), + cadence.NewField("vmError", cadence.StringType), cadence.NewField("transactionType", cadence.UInt8Type), cadence.NewField("gasConsumed", cadence.UInt64Type), cadence.NewField("deployedContractAddress", cadence.StringType), cadence.NewField("returnedValue", cadence.StringType), cadence.NewField("logs", cadence.StringType), -======= - cadence.NewField("blockHeight", cadence.UInt64Type{}), - cadence.NewField("transactionHash", cadence.StringType{}), - cadence.NewField("transaction", cadence.StringType{}), - cadence.NewField("failed", cadence.BoolType{}), - cadence.NewField("vmError", cadence.StringType{}), - cadence.NewField("transactionType", cadence.UInt8Type{}), - cadence.NewField("gasConsumed", cadence.UInt64Type{}), - cadence.NewField("deployedContractAddress", cadence.StringType{}), - cadence.NewField("returnedValue", cadence.StringType{}), - cadence.NewField("logs", cadence.StringType{}), ->>>>>>> 6976a4d55a (Merge pull request #5381 from onflow/ramtin/5380-rename-bridge-account) }, nil, ), diff --git a/fvm/fvm_test.go b/fvm/fvm_test.go remerge CONFLICT (content): Merge conflict in fvm/fvm_test.go index 97a108b49e..9d882a8c5c 100644 --- a/fvm/fvm_test.go +++ b/fvm/fvm_test.go @@ -2854,11 +2854,12 @@ func TestEVM(t *testing.T) { import EVM from %s access(all) fun main() { - let bal = EVM.Balance(attoflow: 1000000000000000000); - let acc <- EVM.createCadenceOwnedAccount(); + let bal = EVM.Balance(attoflow: 1000000000000000000) + let acc <- EVM.createCadenceOwnedAccount() + // withdraw insufficient balance - destroy acc.withdraw(balance: bal); - destroy acc; + destroy acc.withdraw(balance: bal) + destroy acc } `, sc.EVMContract.Address.HexWithPrefix()))) @@ -2918,13 +2919,9 @@ func TestEVM(t *testing.T) { script := fvm.Script([]byte(fmt.Sprintf(` import EVM from %s -<<<<<<< 33b37f1229 (Merge pull request #5400 from onflow/supun/sync-stable-cadence-master) - access(all) fun main() { - destroy <- EVM.createBridgedAccount(); -======= - pub fun main() { - destroy <- EVM.createCadenceOwnedAccount(); ->>>>>>> 6976a4d55a (Merge pull request #5381 from onflow/ramtin/5380-rename-bridge-account) + access(all) + fun main() { + destroy <- EVM.createCadenceOwnedAccount() } `, sc.EVMContract.Address.HexWithPrefix()))) @@ -3010,7 +3007,7 @@ func TestEVM(t *testing.T) { []common.TypeID{ evmLocation.TypeID(nil, string(types.EventTypeTransactionExecuted)), evmLocation.TypeID(nil, string(types.EventTypeBlockExecuted)), - "A.f8d6e0586b0a20c7.EVM.BridgedAccountCreated", + "A.f8d6e0586b0a20c7.EVM.CadenceOwnedAccountCreated", "A.0ae53cb6e3f42a79.FlowToken.TokensWithdrawn", "A.ee82856bf20e2aa6.FungibleToken.Withdrawn", evmLocation.TypeID(nil, string(types.EventTypeTransactionExecuted)),