Balance type refactoring

CHANGES.md

@@ -7,6 +7,41 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.3.0] - 2021-12-10
+
+### Added
+
+- A precompile which exposes NEAR's random number generator was added by [@mfornet] as requested by 
+[@birchmd]. ([#368] [#297])
+- London hard fork support was added by [@birchmd]. ([#244])
+
+### Changes
+
+- The gas limit for `deposit` and `ft_on_transfer` were changed as they were not attaching enough
+gas, as changed by [@mrLSD]. ([#389])
+
+### Fixes
+
+- There was an issue with the original storage not actually being stored. Unfortunately, previous 
+transactions can't be updated with this change. This has been fixed by [@birchmd]. ([#390])
+- Call arguments were intended to have a value attached to them to make it equivalent to an ETH
+call. This was fixed in a backwards compatible manner by [@andrcmdr], as reported by [@birchmd].
+([#351] [#309])
+
+### Removed
+
+- Betanet support was dropped and will no longer be supported by [@joshuajbouw]. ([#388])
+
+[#390]: https://github.com/aurora-is-near/aurora-engine/pull/390
+[#389]: https://github.com/aurora-is-near/aurora-engine/pull/389
+[#388]: https://github.com/aurora-is-near/aurora-engine/pull/388
+[#368]: https://github.com/aurora-is-near/aurora-engine/pull/368
+[#351]: https://github.com/aurora-is-near/aurora-engine/pull/351
+[#311]: https://github.com/aurora-is-near/aurora-engine/pull/311 
+[#309]: https://github.com/aurora-is-near/aurora-engine/issues/309
+[#297]: https://github.com/aurora-is-near/aurora-engine/issues/297
+[#244]: https://github.com/aurora-is-near/aurora-engine/pull/244 
+
 ## [2.2.0] - 2021-11-09
 
 ### Added
@@ -145,7 +180,8 @@ struct SubmitResult {
 
 ## [1.0.0] - 2021-05-12
 
-[Unreleased]: https://github.com/aurora-is-near/aurora-engine/compare/2.2.0...master
+[Unreleased]: https://github.com/aurora-is-near/aurora-engine/compare/2.3.0...master
+[2.3.0]: https://github.com/aurora-is-near/aurora-engine/compare/2.2.0...2.3.0 
 [2.2.0]: https://github.com/aurora-is-near/aurora-engine/compare/2.1.0...2.2.0
 [2.1.0]: https://github.com/aurora-is-near/aurora-engine/compare/2.0.2...2.1.0
 [2.0.2]: https://github.com/aurora-is-near/aurora-engine/compare/2.0.1...2.0.2
@@ -167,7 +203,9 @@ struct SubmitResult {
 [1.1.0]: https://github.com/aurora-is-near/aurora-engine/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/aurora-is-near/aurora-engine/tree/1.0.0
 
-[@mrLSD]: https://github.com/mrLSD
+[@andrcmdr]: https://github.com/andrcmdr
 [@birchmd]: https://github.com/birchmd
 [@joshuajbouw]: https://github.com/joshuajbouw
+[@mfornet]: https://github.com/mfornet
+[@mrLSD]: https://github.com/mrLSD
 [@sept-en]: https://github.com/sept-en

README.md

@@ -15,8 +15,8 @@ documentation.
 Network | Contract ID         | Chain ID   | Version
 ------- | ------------------- | ---------- | ------
 Mainnet | [`aurora`][Mainnet] | 1313161554 | 2.2.0
-Testnet | [`aurora`][Testnet] | 1313161555 | 2.2.0
-Local   | `aurora.test.near`  | 1313161556 | 2.2.0
+Testnet | [`aurora`][Testnet] | 1313161555 | 2.3.0
+Local   | `aurora.test.near`  | 1313161556 | 2.3.0
 
 [Mainnet]: https://explorer.near.org/accounts/aurora
 [Testnet]: https://explorer.testnet.near.org/accounts/aurora

VERSION

@@ -1 +1 @@
-2.2.0
+2.3.0

engine-precompiles/src/lib.rs

@@ -52,7 +52,7 @@ impl From<PrecompileOutput> for evm::executor::PrecompileOutput {
     fn from(output: PrecompileOutput) -> Self {
         evm::executor::PrecompileOutput {
             exit_status: ExitSucceed::Returned,
-            cost: output.cost.into_u64(),
+            cost: output.cost.as_u64(),
             output: output.output,
             logs: output.logs,
         }

engine-precompiles/src/native.rs

@@ -5,6 +5,7 @@ use crate::prelude::{
     parameters::{PromiseArgs, PromiseCreateArgs, WithdrawCallArgs},
     sdk,
     storage::{bytes_to_key, KeyPrefix},
+    types::Yocto,
     vec, BorshSerialize, Cow, String, ToString, TryFrom, TryInto, Vec, H160, U256,
 };
 #[cfg(all(feature = "error_refund", feature = "contract"))]
@@ -24,7 +25,7 @@ use evm::{Context, ExitError};
 const ERR_TARGET_TOKEN_NOT_FOUND: &str = "Target token not found";
 
 mod costs {
-    use crate::prelude::types::EthGas;
+    use crate::prelude::types::{EthGas, NearGas};
 
     // TODO(#51): Determine the correct amount of gas
     pub(super) const EXIT_TO_NEAR_GAS: EthGas = EthGas::new(0);
@@ -33,14 +34,14 @@ mod costs {
     pub(super) const EXIT_TO_ETHEREUM_GAS: EthGas = EthGas::new(0);
 
     // TODO(#332): Determine the correct amount of gas
-    pub(super) const FT_TRANSFER_GAS: EthGas = EthGas::new(100_000_000_000_000);
+    pub(super) const FT_TRANSFER_GAS: NearGas = NearGas::new(100_000_000_000_000);
 
     // TODO(#332): Determine the correct amount of gas
     #[cfg(feature = "error_refund")]
-    pub(super) const REFUND_ON_ERROR_GAS: EthGas = EthGas::new(60_000_000_000_000);
+    pub(super) const REFUND_ON_ERROR_GAS: NearGas = NearGas::new(60_000_000_000_000);
 
     // TODO(#332): Determine the correct amount of gas
-    pub(super) const WITHDRAWAL_GAS: EthGas = EthGas::new(100_000_000_000_000);
+    pub(super) const WITHDRAWAL_GAS: NearGas = NearGas::new(100_000_000_000_000);
 }
 
 pub mod events {
@@ -377,15 +378,15 @@ impl Precompile for ExitToNear {
             target_account_id: refund_on_error_target,
             method: "refund_on_error".to_string(),
             args: refund_args.try_to_vec().unwrap(),
-            attached_balance: 0,
-            attached_gas: costs::REFUND_ON_ERROR_GAS.into_u64(),
+            attached_balance: Yocto::new(0),
+            attached_gas: costs::REFUND_ON_ERROR_GAS,
         };
         let transfer_promise = PromiseCreateArgs {
             target_account_id: nep141_address,
             method: "ft_transfer".to_string(),
             args: args.as_bytes().to_vec(),
-            attached_balance: 1,
-            attached_gas: costs::FT_TRANSFER_GAS.into_u64(),
+            attached_balance: Yocto::new(1),
+            attached_gas: costs::FT_TRANSFER_GAS,
         };
 
         #[cfg(feature = "error_refund")]
@@ -463,6 +464,7 @@ impl Precompile for ExitToEthereum {
         context: &Context,
         is_static: bool,
     ) -> EvmPrecompileResult {
+        use crate::prelude::types::NEP141Wei;
         if let Some(target_gas) = target_gas {
             if Self::required_gas(input)? > target_gas {
                 return Err(ExitError::OutOfGas);
@@ -496,7 +498,7 @@ impl Precompile for ExitToEthereum {
                     // as decimal and hexadecimal respectively.
                     WithdrawCallArgs {
                         recipient_address,
-                        amount: context.apparent_value.as_u128(),
+                        amount: NEP141Wei::new(context.apparent_value.as_u128()),
                     }
                     .try_to_vec()
                     .map_err(|_| ExitError::Other(Cow::from("ERR_INVALID_AMOUNT")))?,
@@ -569,8 +571,8 @@ impl Precompile for ExitToEthereum {
             target_account_id: nep141_address,
             method: "withdraw".to_string(),
             args: serialized_args,
-            attached_balance: 1,
-            attached_gas: costs::WITHDRAWAL_GAS.into_u64(),
+            attached_balance: Yocto::new(1),
+            attached_gas: costs::WITHDRAWAL_GAS,
         };
 
         let promise = PromiseArgs::Create(withdraw_promise).try_to_vec().unwrap();

engine-sdk/src/near_runtime.rs

@@ -40,7 +40,7 @@ impl Runtime {
                 b"state_migration",
                 &[],
                 0,
-                Self::GAS_FOR_STATE_MIGRATION.into_u64(),
+                Self::GAS_FOR_STATE_MIGRATION.as_u64(),
             )
         }
     }
@@ -266,8 +266,8 @@ impl crate::promise::PromiseHandler for Runtime {
         let account_id = args.target_account_id.as_bytes();
         let method_name = args.method.as_bytes();
         let arguments = args.args.as_slice();
-        let amount = args.attached_balance;
-        let gas = args.attached_gas;
+        let amount = args.attached_balance.as_u128();
+        let gas = args.attached_gas.as_u64();
 
         let id = unsafe {
             exports::promise_create(
@@ -292,8 +292,8 @@ impl crate::promise::PromiseHandler for Runtime {
         let account_id = callback.target_account_id.as_bytes();
         let method_name = callback.method.as_bytes();
         let arguments = callback.args.as_slice();
-        let amount = callback.attached_balance;
-        let gas = callback.attached_gas;
+        let amount = callback.attached_balance.as_u128();
+        let gas = callback.attached_gas.as_u64();
 
         let id = unsafe {
             exports::promise_then(
@@ -322,7 +322,7 @@ impl crate::promise::PromiseHandler for Runtime {
         for action in args.actions.iter() {
             match action {
                 PromiseAction::Transfer { amount } => unsafe {
-                    let amount = *amount;
+                    let amount = amount.as_u128();
                     exports::promise_batch_action_transfer(id, &amount as *const u128 as _);
                 },
                 PromiseAction::DeployConotract { code } => unsafe {
@@ -341,15 +341,15 @@ impl crate::promise::PromiseHandler for Runtime {
                 } => unsafe {
                     let method_name = name.as_bytes();
                     let arguments = args.as_slice();
-                    let amount = *attached_yocto;
+                    let amount = attached_yocto.as_u128();
                     exports::promise_batch_action_function_call(
                         id,
                         method_name.len() as _,
                         method_name.as_ptr() as _,
                         arguments.len() as _,
                         arguments.as_ptr() as _,
                         &amount as *const u128 as _,
-                        *gas,
+                        gas.as_u64(),
                     )
                 },
             }

engine-standalone/src/ffi.rs

@@ -72,8 +72,8 @@ impl From<TraceLog> for CTraceLog {
         Self {
             depth: log.depth.into_u32(),
             error,
-            gas: log.gas.into_u64(),
-            gas_cost: log.gas_cost.into_u64(),
+            gas: log.gas.as_u64(),
+            gas_cost: log.gas_cost.as_u64(),
             memory_ptr,
             memory_len,
             opcode: log.opcode.as_u8(),
@@ -108,7 +108,7 @@ impl From<TransactionTrace> for CTransactionTrace {
         };
 
         Self {
-            gas: trace.gas().into_u64(),
+            gas: trace.gas().as_u64(),
             result: CString::new(trace.result()).expect("CString::new failed"),
             logs_ptr,
             logs_len,

engine-tests/src/test_utils/mod.rs

@@ -1,4 +1,5 @@
 use aurora_engine_types::account_id::AccountId;
+use aurora_engine_types::types::NEP141Wei;
 use borsh::{BorshDeserialize, BorshSerialize};
 use near_primitives_core::config::VMConfig;
 use near_primitives_core::contract::ContractCode;
@@ -270,7 +271,8 @@ impl AuroraRunner {
                 .get(&ft_key)
                 .map(|bytes| FungibleToken::try_from_slice(&bytes).unwrap())
                 .unwrap_or_default();
-            current_ft.total_eth_supply_on_near += init_balance.raw().as_u128();
+            current_ft.total_eth_supply_on_near =
+                current_ft.total_eth_supply_on_near + NEP141Wei::new(init_balance.raw().as_u128());
             current_ft
         };
 

engine-tests/src/test_utils/standalone/mocks/mod.rs

@@ -1,15 +1,14 @@
+use crate::test_utils;
 use aurora_engine::engine;
 use aurora_engine::fungible_token::FungibleTokenMetadata;
 use aurora_engine::parameters::{FinishDepositCallArgs, InitCallArgs, NewCallArgs};
 use aurora_engine_sdk::env::{Env, DEFAULT_PREPAID_GAS};
 use aurora_engine_sdk::io::IO;
-use aurora_engine_types::types::NearGas;
+use aurora_engine_types::types::{NEP141Wei, NearGas};
 use aurora_engine_types::{account_id::AccountId, types::Wei, Address, H256, U256};
 use engine_standalone_storage::{BlockMetadata, Storage};
 use near_sdk_sim::DEFAULT_GAS;
 
-use crate::test_utils;
-
 pub mod block;
 pub mod promise;
 pub mod storage;
@@ -101,7 +100,7 @@ pub fn mint_evm_account<I: IO + Copy, E: Env>(
 
     let deposit_args = FinishDepositCallArgs {
         new_owner_id: aurora_account_id.clone(),
-        amount: balance.raw().low_u128(),
+        amount: NEP141Wei::new(balance.raw().as_u128()),
         proof_key: String::new(),
         relayer_id: aurora_account_id.clone(),
         fee: 0.into(),

engine-tests/src/tests/erc20_connector.rs

@@ -267,7 +267,7 @@ fn test_ft_on_transfer() {
     let nep141 = "tt.testnet".to_string();
     let alice = "alice".to_string();
     let token = runner.deploy_erc20_token(&nep141);
-    let amount = 10;
+    let amount = Balance::new(10);
     let recipient = runner.create_account().address;
 
     let balance = runner.balance_of(token, recipient, origin());
@@ -278,15 +278,15 @@ fn test_ft_on_transfer() {
     assert_eq!(res, "\"0\"");
 
     let balance = runner.balance_of(token, recipient, origin());
-    assert_eq!(balance, U256::from(amount));
+    assert_eq!(balance, U256::from(amount.as_u128()));
 }
 
 #[test]
 fn test_ft_on_transfer_fail() {
     let mut runner = AuroraRunner::new();
     let nep141 = "tt.testnet".to_string();
     let alice = "alice".to_string();
-    let amount = 10;
+    let amount = Balance::new(10);
 
     let recipient = runner.create_account().address;
 
@@ -301,7 +301,7 @@ fn test_relayer_charge_fee() {
     let mut runner = AuroraRunner::new();
     // Standalone runner presently does not support ft_on_transfer
     runner.standalone_runner = None;
-    let amount = 10;
+    let amount = Balance::new(10);
     let fee = 51;
     let nep141 = "tt.testnet".to_string();
     let alice = "alice".to_string();
@@ -339,7 +339,7 @@ fn test_relayer_charge_fee() {
     assert_eq!(relayer_balance, Wei::new_u64(fee));
 
     let balance = runner.balance_of(token, recipient, origin());
-    assert_eq!(balance, U256::from(amount));
+    assert_eq!(balance, U256::from(amount.as_u128()));
 }
 
 #[test]