Merge pull request #79 from onflow/giovanni/update-evm

Update EVM Cadence
onflow · Feb 24, 2024 · 5e46c10 · 5e46c10
2 parents 021e7e9 + 0b5af6c
commit 5e46c10
Show file tree

Hide file tree

Showing 8 changed files with 315 additions and 66 deletions.
diff --git a/cadence/contracts/EVM.cdc b/cadence/contracts/EVM.cdc
diff --git a/cadence/scripts/evm/get_balance.cdc b/cadence/scripts/evm/get_balance.cdc
@@ -10,5 +10,5 @@ access(all) fun main(address: String): UFix64 {
         bytes[10], bytes[11], bytes[12], bytes[13], bytes[14],
         bytes[15], bytes[16], bytes[17], bytes[18], bytes[19]
     ]
-    return EVM.EVMAddress(bytes: addressBytes).balance().flow
+    return EVM.EVMAddress(bytes: addressBytes).balance().inFLOW()
 }
diff --git a/cadence/scripts/evm/get_evm_address_string.cdc b/cadence/scripts/evm/get_evm_address_string.cdc
@@ -4,7 +4,7 @@ import "EVM"
 ///
 access(all) fun main(flowAddress: Address): String? {
     let account = getAuthAccount<auth(BorrowValue) &Account>(flowAddress)
-    if let address = account.storage.borrow<&EVM.BridgedAccount>(from: /storage/evm)?.address() {
+    if let address = account.storage.borrow<&EVM.CadenceOwnedAccount>(from: /storage/evm)?.address() {
         let bytes: [UInt8] = []
         for byte in address.bytes {
             bytes.append(byte)

diff --git a/cadence/transactions/evm/create_coa_and_fund.cdc b/cadence/transactions/evm/create_coa_and_fund.cdc
@@ -8,18 +8,18 @@ import "EVM"
 ///
 transaction(amount: UFix64) {
     let sentVault: @FlowToken.Vault
-    let coa: &EVM.BridgedAccount
+    let coa: &EVM.CadenceOwnedAccount
 
     prepare(signer: auth(Storage) &Account) {
-        let vaultRef = signer.storage.borrow<auth(FungibleToken.Withdrawable) &FlowToken.Vault>(
+        let vaultRef = signer.storage.borrow<auth(FungibleToken.Withdraw) &FlowToken.Vault>(
                 from: /storage/flowTokenVault
             ) ?? panic("Could not borrow reference to the owner's Vault!")
 
         self.sentVault <- vaultRef.withdraw(amount: amount) as! @FlowToken.Vault
-        if signer.storage.borrow<&EVM.BridgedAccount>(from: /storage/evm) == nil {
-            signer.storage.save(<-EVM.createBridgedAccount(), to: /storage/evm)
+        if signer.storage.borrow<&EVM.CadenceOwnedAccount>(from: /storage/evm) == nil {
+            signer.storage.save(<-EVM.createCadenceOwnedAccount(), to: /storage/evm)
         }
-        self.coa = signer.storage.borrow<&EVM.BridgedAccount>(from: /storage/evm)
+        self.coa = signer.storage.borrow<&EVM.CadenceOwnedAccount>(from: /storage/evm)
             ?? panic("Could not borrow reference to the signer's COA!")
     }
 

diff --git a/cadence/transactions/evm/create_flow_account_with_coa_and_fund.cdc b/cadence/transactions/evm/create_flow_account_with_coa_and_fund.cdc
@@ -57,7 +57,7 @@ transaction(
 
         self.tokenReceiver.deposit(from: <-flowVault)
 
-        let coa <- EVM.createBridgedAccount()
+        let coa <- EVM.createCadenceOwnedAccount()
         coa.address().deposit(from: <-evmVault)
 
         self.newAccount.storage.save(<-coa, to: StoragePath(identifier: "evm")!)

diff --git a/cadence/transactions/evm/mint_and_fund_evm_address.cdc b/cadence/transactions/evm/mint_and_fund_evm_address.cdc
@@ -8,16 +8,16 @@ import "EVM"
 transaction(to: EVM.EVMAddress, amount: UFix64, gasLimit: UInt64) {
 
     let tokenAdmin: &FlowToken.Administrator
-    let coa: &EVM.BridgedAccount
+    let coa: auth(EVM.Call) &EVM.CadenceOwnedAccount
 
     prepare(signer: auth(Storage) &Account) {
         self.tokenAdmin = signer.storage.borrow<&FlowToken.Administrator>(from: /storage/flowTokenAdmin)
             ?? panic("Signer is not the token admin")
 
-        if signer.storage.borrow<&EVM.BridgedAccount>(from: /storage/evm) == nil {
-            signer.storage.save(<-EVM.createBridgedAccount(), to: /storage/evm)
+        if signer.storage.borrow<&EVM.CadenceOwnedAccount>(from: /storage/evm) == nil {
+            signer.storage.save(<-EVM.createCadenceOwnedAccount(), to: /storage/evm)
         }
-        self.coa = signer.storage.borrow<&EVM.BridgedAccount>(from: /storage/evm)
+        self.coa = signer.storage.borrow<auth(EVM.Call) &EVM.CadenceOwnedAccount>(from: /storage/evm)
             ?? panic("Could not borrow reference to the signer's COA!")
     }
 

diff --git a/cadence/transactions/transfer_flow.cdc b/cadence/transactions/transfer_flow.cdc
@@ -9,7 +9,7 @@ transaction (amount: UFix64, to: Address) {
     prepare(signer: auth(BorrowValue) &Account) {
 
         // Get a reference to the signer's stored vault
-        let vaultRef = signer.storage.borrow<auth(FungibleToken.Withdrawable) &FlowToken.Vault>(from: /storage/flowTokenVault)
+        let vaultRef = signer.storage.borrow<auth(FungibleToken.Withdraw) &FlowToken.Vault>(from: /storage/flowTokenVault)
 			?? panic("Could not borrow reference to the owner's Vault!")
 
         // Withdraw tokens from the signer's stored vault

diff --git a/lib/flow/fund.ts b/lib/flow/fund.ts
@@ -43,16 +43,16 @@ import EVM from ${publicConfig.contractEVM}
 transaction(to: EVM.EVMAddress, amount: UFix64, gasLimit: UInt64) {
 
     let tokenAdmin: &FlowToken.Administrator
-    let coa: &EVM.BridgedAccount
+    let coa: auth(EVM.Call) &EVM.CadenceOwnedAccount
 
     prepare(signer: auth(Storage) &Account) {
         self.tokenAdmin = signer.storage.borrow<&FlowToken.Administrator>(from: /storage/flowTokenAdmin)
             ?? panic("Signer is not the token admin")
 
-        if signer.storage.borrow<&EVM.BridgedAccount>(from: /storage/evm) == nil {
-            signer.storage.save(<-EVM.createBridgedAccount(), to: /storage/evm)
+        if signer.storage.borrow<&EVM.CadenceOwnedAccount>(from: /storage/evm) == nil {
+            signer.storage.save(<-EVM.createCadenceOwnedAccount(), to: /storage/evm)
         }
-        self.coa = signer.storage.borrow<&EVM.BridgedAccount>(from: /storage/evm)
+        self.coa = signer.storage.borrow<auth(EVM.Call) &EVM.CadenceOwnedAccount>(from: /storage/evm)
             ?? panic("Could not borrow reference to the signer's COA!")
     }