Merge branch 'develop' into feat/london/eip-1559

CHANGES.md

@@ -7,40 +7,48 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.6.4] - 2021-09-29
+
+### Changes
+
+- Fix JSON formatting in `ft_metadata` method by [@birchmd].
+- Fix a bug in `block.timestamp` (units should be seconds) by [@birchmd].
+
 ## [1.6.3] - 2021-09-14
 
 ### Changes
 
-- Revert ERC20 admin address changes for the time being by [@joshuajbouw].
+- Revert the ERC-20 admin address changes for the time being by [@joshuajbouw].
 
 ## [1.6.2] - 2021-09-13
 
 ### Changes
 
-- ERC20 admin address has been changed to have a dedicated account by [@sept-en].
-- Precompile promises were fixed that were broken in rust-blockchain/evm by [@joshuajbouw] and [@birchmd].
-- Return format of `ft_balance_of` was fixed by [@joshuajbouw].
+- Change the ERC-20 admin address to have a dedicated account by [@sept-en].
+- Fix precompile promises that were broken in rust-blockchain/evm by
+  [@joshuajbouw] and [@birchmd].
+- Fix the return format of `ft_balance_of` by [@joshuajbouw].
 
 ### Removed
 
-- Testnet balancing `balance_evm_and_nep141` has been removed by [@birchmd].
+- Remove Testnet balancing `balance_evm_and_nep141` by [@birchmd].
 
 ## [1.6.1] - 2021-08-23
 
 ### Breaking changes
 
-- The `view` call has been correctly updated to return the Borsh
-  serialization of `TransactionStatus`. Previously, it was returning a
-  string with the result of the transaction by name.
+- Update the `view` call to correctly return the Borsh serialization of
+  `TransactionStatus`. Previously, it returned a string with the result of
+  the transaction by name.
 
-- The `ft_balance_of` result was changed as previously it was returning a
-  non-JSON string value `0`. This has been fixed to return `"0"`.
+- Change the `ft_balance_of` result as previously it returned a non-JSON
+  string value `0`. This has been fixed to return `"0"`.
 
 ## [1.6.0] - 2021-08-13
 
 ### Breaking changes
 
-- The transaction status of `submit` was changed as running out of gas,
+- Change the transaction status of `submit` as running out of gas,
   funds, or being out-of-the-offset are not fatal errors but failed
   executions.
 
@@ -86,7 +94,8 @@ struct SubmitResult {
 
 ## [1.0.0] - 2021-05-12
 
-[Unreleased]: https://github.com/aurora-is-near/aurora-engine/compare/1.6.3...master
+[Unreleased]: https://github.com/aurora-is-near/aurora-engine/compare/1.6.4...master
+[1.6.4]: https://github.com/aurora-is-near/aurora-engine/compare/1.6.3...1.6.4
 [1.6.3]: https://github.com/aurora-is-near/aurora-engine/compare/1.6.2...1.6.3
 [1.6.2]: https://github.com/aurora-is-near/aurora-engine/compare/1.6.1...1.6.2
 [1.6.1]: https://github.com/aurora-is-near/aurora-engine/compare/1.6.0...1.6.1

README.md

@@ -14,10 +14,10 @@ documentation.
 
 Network | Contract ID         | Chain ID   | Version
 ------- | ------------------- | ---------- | ------
-Mainnet | [`aurora`][Mainnet] | 1313161554 | 1.6.3
-Testnet | [`aurora`][Testnet] | 1313161555 | 1.6.3
-Betanet | [`aurora`][Betanet] | 1313161556 | 1.6.3
-Local   | `aurora.test.near`  | 1313161556 | 1.6.3
+Mainnet | [`aurora`][Mainnet] | 1313161554 | 1.6.4
+Testnet | [`aurora`][Testnet] | 1313161555 | 1.6.4
+Betanet | [`aurora`][Betanet] | 1313161556 | 1.6.4
+Local   | `aurora.test.near`  | 1313161556 | 1.6.4
 
 [Mainnet]: https://explorer.near.org/accounts/aurora
 [Testnet]: https://explorer.testnet.near.org/accounts/aurora

VERSION

@@ -1 +1 @@
-1.7.0
+1.6.4

engine-precompiles/src/lib.rs

@@ -206,7 +206,7 @@ impl Precompiles {
 /// const fn for making an address by concatenating the bytes from two given numbers,
 /// Note that 32 + 128 = 160 = 20 bytes (the length of an address). This function is used
 /// as a convenience for specifying the addresses of the various precompiles.
-const fn make_address(x: u32, y: u128) -> prelude::Address {
+pub const fn make_address(x: u32, y: u128) -> prelude::Address {
     let x_bytes = x.to_be_bytes();
     let y_bytes = y.to_be_bytes();
     prelude::Address([
@@ -233,6 +233,45 @@ const fn make_address(x: u32, y: u128) -> prelude::Address {
     ])
 }
 
+const fn make_h256(x: u128, y: u128) -> prelude::H256 {
+    let x_bytes = x.to_be_bytes();
+    let y_bytes = y.to_be_bytes();
+    prelude::H256([
+        x_bytes[0],
+        x_bytes[1],
+        x_bytes[2],
+        x_bytes[3],
+        x_bytes[4],
+        x_bytes[5],
+        x_bytes[6],
+        x_bytes[7],
+        x_bytes[8],
+        x_bytes[9],
+        x_bytes[10],
+        x_bytes[11],
+        x_bytes[12],
+        x_bytes[13],
+        x_bytes[14],
+        x_bytes[15],
+        y_bytes[0],
+        y_bytes[1],
+        y_bytes[2],
+        y_bytes[3],
+        y_bytes[4],
+        y_bytes[5],
+        y_bytes[6],
+        y_bytes[7],
+        y_bytes[8],
+        y_bytes[9],
+        y_bytes[10],
+        y_bytes[11],
+        y_bytes[12],
+        y_bytes[13],
+        y_bytes[14],
+        y_bytes[15],
+    ])
+}
+
 #[cfg(test)]
 mod tests {
     use crate::{prelude, Byzantium, Istanbul};