Merge branch 'main' into dependabot/cargo/libgit2-sys-0.16.21.7.2

aurora-is-near · Mar 19, 2024 · 3123209 · 3123209
2 parents 582301d + f5eea66
commit 3123209
Show file tree

Hide file tree

Showing 19 changed files with 1,345 additions and 620 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ name = "aurora-cli-rs"
 version = "0.1.0"
 authors = ["Aurora Labs <[email protected]>"]
 edition = "2021"
-rust-version = "1.70.0"
+rust-version = "1.75.0"
 homepage = "https://github.com/aurora-is-near/aurora-cli-rs"
 repository = "https://github.com/aurora-is-near/aurora-cli-rs"
 description = "Aurora CLI is a command line interface to bootstrap Aurora engine"
@@ -14,36 +14,37 @@ name = "aurora-cli"
 path = "src/main.rs"
 
 [features]
-default = [ "simple" ]
-simple = []
-advanced = []
+default = ["simple"]
+simple = ["toml"]
+advanced = ["near-chain-configs"]
 
 [dependencies]
-aurora-engine-precompiles = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.3.1", features = ["std"] }
-aurora-engine-sdk = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.3.1", features = ["std"] }
-aurora-engine-transactions = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.3.1", features = ["std"] }
-aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.3.1", features = ["std", "impl-serde"] }
+aurora-engine-precompiles = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.1", features = ["std"] }
+aurora-engine-sdk = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.1", features = ["std"] }
+aurora-engine-transactions = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.1", features = ["std"] }
+aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.1", features = ["std", "impl-serde"] }
 
 anyhow = "1"
 bs58 = "0.5"
 clap = { version = "4", features = ["derive"] }
 ethabi = "18"
-hex = "0.4.3"
-lazy_static = "1.4.0"
+hex = "0.4"
+lazy_static = "1"
 libsecp256k1 = { version = "0.7", features = ["std"] }
-near-chain-configs = "0.17"
-near-crypto = "0.17"
-near-jsonrpc-client = "0.6"
-near-jsonrpc-primitives = "0.17"
-near-primitives = "0.17"
+near-chain-configs = { version = "0.20", optional = true }
+near-crypto = "0.20"
+near-jsonrpc-client = "0.8"
+near-jsonrpc-primitives = "0.20"
+near-primitives = "0.20"
 reqwest = { version = "0.11", features = ["json"] }
 rand = "0.8"
-rlp = "0.5.0"
+rlp = "0.5"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-shadow-rs = "0.24"
+toml = { version = "0.8", optional = true }
+shadow-rs = "0.27"
 thiserror = "1"
 tokio = { version = "1", features = ["full"] }
 
 [build-dependencies]
-shadow-rs = "0.24"
+shadow-rs = "0.27"
diff --git a/rust-toolchain b/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.70.0"
+channel = "1.75.0"
 components = [ "clippy", "rustfmt" ]
diff --git a/scripts/advanced.sh b/scripts/advanced.sh
@@ -2,16 +2,17 @@
 
 EVM_CODE=$(cat docs/res/HelloWorld.hex)
 ABI_PATH="docs/res/HelloWorld.abi"
-AURORA_LAST_VERSION="2.9.2"
+AURORA_LAST_VERSION=$(curl -s https://api.github.com/repos/aurora-is-near/aurora-engine/releases/latest | jq -r .tag_name)
 ENGINE_WASM_URL="https://github.com/aurora-is-near/aurora-engine/releases/download/$AURORA_LAST_VERSION/aurora-mainnet.wasm"
 ENGINE_WASM_PATH="/tmp/aurora-mainnet.wasm"
-USER_BASE_BIN=$(python3 -m site --user-base)/bin
+VENV=/tmp/venv
 
-export PATH="$PATH:$USER_BASE_BIN:$HOME/.cargo/bin"
 export NEARCORE_HOME="/tmp/localnet"
 
 # Install `nearup` utility if not installed before.
-pip3 list | grep nearup > /dev/null || pip3 install --user nearup
+python3 -m venv $VENV
+source $VENV/bin/activate
+pip list | grep nearup > /dev/null || pip install nearup > /dev/null
 
 start_node() {
   cmd="nearup run localnet --home $NEARCORE_HOME --num-nodes 1"
@@ -27,7 +28,8 @@ finish() {
   # Stop NEAR node.
   nearup stop > /dev/null 2>&1
   # Cleanup
-  rm -rf $NEARCORE_HOME
+  deactivate
+  rm -rf $NEARCORE_HOME $VENV
 
   if [[ -z "$1" ]]; then
     exit 0

diff --git a/scripts/different-outputs.sh b/scripts/different-outputs.sh
@@ -0,0 +1,215 @@
+#!/usr/bin/env bash
+
+export NEARCORE_HOME="/tmp/localnet"
+
+AURORA_PREV_VERSION="3.6.0"
+AURORA_LAST_VERSION=$(curl -s https://api.github.com/repos/aurora-is-near/aurora-engine/releases/latest | jq -r .tag_name)
+EVM_CODE=$(cat docs/res/HelloWorld.hex)
+ABI_PATH="docs/res/HelloWorld.abi"
+ENGINE_PREV_WASM_URL="https://github.com/aurora-is-near/aurora-engine/releases/download/$AURORA_PREV_VERSION/aurora-mainnet.wasm"
+ENGINE_LAST_WASM_URL="https://github.com/aurora-is-near/aurora-engine/releases/download/$AURORA_LAST_VERSION/aurora-mainnet.wasm"
+XCC_ROUTER_LAST_WASM_URL="https://github.com/aurora-is-near/aurora-engine/releases/download/$AURORA_LAST_VERSION/aurora-factory-mainnet.wasm"
+ENGINE_WASM_PATH="/tmp/aurora-mainnet.wasm"
+XCC_ROUTER_WASM_PATH="/tmp/aurora-factory-mainnet.wasm"
+NODE_KEY_PATH=$NEARCORE_HOME/node0/validator_key.json
+AURORA_KEY_PATH=$NEARCORE_HOME/node0/aurora_key.json
+MANAGER_KEY_PATH=$NEARCORE_HOME/node0/manager_key.json
+RELAYER_KEY_PATH=$NEARCORE_HOME/node0/relayer_key.json
+AURORA_SECRET_KEY=27cb3ddbd18037b38d7fb9ae3433a9d6f5cd554a4ba5768c8a15053f688ee167
+ENGINE_ACCOUNT=aurora.node0
+MANAGER_ACCOUNT=key-manager.aurora.node0
+VENV=/tmp/venv
+
+export PATH="$HOME/NearProtocol/aurora/aurora-cli-rs/target/debug/:$PATH:$USER_BASE_BIN"
+
+
+# Install `nearup` utility if not installed before.
+python3 -m venv $VENV
+source $VENV/bin/activate
+pip list | grep nearup > /dev/null || pip install nearup > /dev/null
+
+start_node() {
+  cmd="nearup run localnet --home $NEARCORE_HOME"
+
+  if [[ $(uname -m) == "arm64" ]]; then # Check for local execution
+    cmd="$cmd --binary-path $HOME/.nearup/near/localnet --num-nodes 1"
+  fi
+
+  $cmd > /dev/null 2>&1
+}
+
+stop_node() {
+  nearup stop > /dev/null 2>&1
+}
+
+finish() {
+  # Stop NEAR node.
+  stop_node
+  # Cleanup
+  deactivate
+  rm -rf $NEARCORE_HOME $VENV
+
+  if [[ -z "$1" ]]; then
+    exit 0
+  else
+    exit "$1"
+  fi
+}
+
+error_exit() {
+  finish 1
+}
+
+assert_eq() {
+  if [[ $1 != $2 ]]; then
+    echo "Unexpected result, should be $1 but actual is $2"
+    finish 1
+  fi
+}
+
+# Start NEAR node.
+start_node
+sleep 1
+
+# Download Aurora EVM.
+curl -sL $ENGINE_PREV_WASM_URL -o $ENGINE_WASM_PATH || error_exit
+
+export NEAR_KEY_PATH=$NODE_KEY_PATH
+# Create an account for Aurora EVM.
+aurora-cli create-account --account $ENGINE_ACCOUNT --balance 100 > $AURORA_KEY_PATH || error_exit
+sleep 1
+
+# View info of created account.
+aurora-cli view-account $ENGINE_ACCOUNT || error_exit
+sleep 1
+
+# Deploy Aurora EVM.
+export NEAR_KEY_PATH=$AURORA_KEY_PATH
+aurora-cli deploy-aurora $ENGINE_WASM_PATH || error_exit
+sleep 4
+# Init Aurora EVM.
+aurora-cli --engine $ENGINE_ACCOUNT init \
+  --chain-id 1313161556 \
+  --owner-id $ENGINE_ACCOUNT \
+  --bridge-prover-id "prover" \
+  --upgrade-delay-blocks 1 \
+  --custodian-address 0x1B16948F011686AE64BB2Ba0477aeFA2Ea97084D \
+  --ft-metadata-path docs/res/ft_metadata.json || error_exit
+sleep 2
+
+# Upgrading Aurora EVM to 2.10.0.
+version=$(aurora-cli --engine $ENGINE_ACCOUNT get-version || error_exit)
+assert_eq "$version" $AURORA_PREV_VERSION
+echo "$version"
+curl -sL $ENGINE_LAST_WASM_URL -o $ENGINE_WASM_PATH || error_exit
+aurora-cli --engine $ENGINE_ACCOUNT stage-upgrade $ENGINE_WASM_PATH || error_exit
+sleep 2
+aurora-cli --engine $ENGINE_ACCOUNT deploy-upgrade || error_exit
+sleep 1
+version=$(aurora-cli --engine $ENGINE_ACCOUNT get-version || error_exit)
+assert_eq "$version" $AURORA_LAST_VERSION
+echo "$version"
+
+# Create account id for key manager
+aurora-cli create-account --account $MANAGER_ACCOUNT --balance 10 > $MANAGER_KEY_PATH || error_exit
+sleep 1
+
+# Set key manager
+aurora-cli --engine $ENGINE_ACCOUNT set-key-manager $MANAGER_ACCOUNT || error_exit
+sleep 1
+
+# Create new keys for relayer
+aurora-cli generate-near-key $ENGINE_ACCOUNT ed25519 > $RELAYER_KEY_PATH || error_exit
+relayer_public_key="$(jq -r .public_key < $RELAYER_KEY_PATH)"
+
+# Add relayer key by key manager
+export NEAR_KEY_PATH=$MANAGER_KEY_PATH
+aurora-cli --engine $ENGINE_ACCOUNT add-relayer-key --public-key "$relayer_public_key" --allowance "0.5" || error_exit
+sleep 1
+
+# Deploy Hello World EVM code with relayer key.
+export NEAR_KEY_PATH=$RELAYER_KEY_PATH
+aurora-cli --engine $ENGINE_ACCOUNT deploy --code "$EVM_CODE" --aurora-secret-key $AURORA_SECRET_KEY || error_exit
+sleep 1
+result=$(aurora-cli --engine $ENGINE_ACCOUNT view-call -a 0xa3078bf607d2e859dca0b1a13878ec2e607f30de -f greet \
+  --abi-path $ABI_PATH || error_exit)
+assert_eq "$result" "Hello, World!"
+sleep 1
+
+# Remove relayer key
+export NEAR_KEY_PATH=$MANAGER_KEY_PATH
+aurora-cli --engine $ENGINE_ACCOUNT remove-relayer-key "$relayer_public_key" || error_exit
+sleep 1
+
+# Deploy Counter EVM code.
+export NEAR_KEY_PATH=$AURORA_KEY_PATH
+EVM_CODE=$(cat docs/res/Counter.hex)
+ABI_PATH=docs/res/Counter.abi
+aurora-cli --engine $ENGINE_ACCOUNT deploy --code $EVM_CODE --abi-path $ABI_PATH --args '{"init_value":"5"}' \
+  --aurora-secret-key $AURORA_SECRET_KEY || error_exit
+sleep 1
+result=$(aurora-cli --engine $ENGINE_ACCOUNT view-call -a 0x4cf003049d1a9c4918c73e9bf62464d904184555 -f value \
+  --abi-path $ABI_PATH || error_exit)
+assert_eq "$result" "5"
+sleep 1
+aurora-cli --engine $ENGINE_ACCOUNT call -a 0x4cf003049d1a9c4918c73e9bf62464d904184555 -f increment \
+  --abi-path $ABI_PATH \
+  --aurora-secret-key 611830d3641a68f94a690dcc25d1f4b0dac948325ac18f6dd32564371735f32c || error_exit
+sleep 1
+result=$(aurora-cli --engine $ENGINE_ACCOUNT view-call -a 0x4cf003049d1a9c4918c73e9bf62464d904184555 -f value \
+  --abi-path $ABI_PATH || error_exit)
+assert_eq "$result" "6"
+sleep 1
+aurora-cli --engine $ENGINE_ACCOUNT call -a 0x4cf003049d1a9c4918c73e9bf62464d904184555 -f decrement \
+  --abi-path $ABI_PATH \
+  --aurora-secret-key 611830d3641a68f94a690dcc25d1f4b0dac948325ac18f6dd32564371735f32c || error_exit
+sleep 1
+result=$(aurora-cli --engine $ENGINE_ACCOUNT view-call -a 0x4cf003049d1a9c4918c73e9bf62464d904184555 -f value \
+  --abi-path $ABI_PATH || error_exit)
+assert_eq "$result" "5"
+sleep 1
+
+# Check read operations.
+aurora-cli --engine $ENGINE_ACCOUNT get-chain-id || error_exit
+aurora-cli --engine $ENGINE_ACCOUNT get-owner || error_exit
+aurora-cli --engine $ENGINE_ACCOUNT get-bridge-prover || error_exit
+aurora-cli --engine $ENGINE_ACCOUNT get-balance 0x04b678962787ccd195a8e324d4c6bc4d5727f82b || error_exit
+aurora-cli --engine $ENGINE_ACCOUNT get-code 0xa3078bf607d2e859dca0b1a13878ec2e607f30de || error_exit
+aurora-cli key-pair --seed 1 || error_exit
+block_hash=$(aurora-cli --network mainnet get-block-hash 88300374 || error_exit)
+assert_eq "$block_hash" "0xd31857e9ce14083a7a74092b71f9ac48b8c0d4988ad40074182c1f0ffa296ec5"
+
+# Register a new relayer address
+aurora-cli --engine $ENGINE_ACCOUNT register-relayer 0xf644ad75e048eaeb28844dd75bd384984e8cd508 || error_exit
+sleep 1
+
+# Set a new owner. The functionality has not been released yet.
+aurora-cli --engine $ENGINE_ACCOUNT set-owner node0 || error_exit
+sleep 1
+owner=$(aurora-cli --engine $ENGINE_ACCOUNT get-owner || error_exit)
+assert_eq "$owner" node0
+export NEAR_KEY_PATH=$NODE_KEY_PATH
+aurora-cli --engine $ENGINE_ACCOUNT set-owner aurora.node0 || error_exit
+sleep 1
+owner=$(aurora-cli --engine $ENGINE_ACCOUNT get-owner || error_exit)
+assert_eq "$owner" $ENGINE_ACCOUNT
+
+# XCC router operations.
+# Download XCC router contract.
+curl -sL $XCC_ROUTER_LAST_WASM_URL -o $XCC_ROUTER_WASM_PATH || error_exit
+aurora-cli --engine $ENGINE_ACCOUNT factory-update $XCC_ROUTER_WASM_PATH || error_exit
+sleep 1
+aurora-cli --engine $ENGINE_ACCOUNT factory-set-wnear-address 0x80c6a002756e29b8bf2a587f7d975a726d5de8b9 || error_exit
+sleep 1
+# aurora-cli --engine $ENGINE_ACCOUNT fund-xcc-sub-account 0x43a4969cc2c22d0000c591ff4bd71983ea8a8be9 some_account.near 25.5 || error_exit
+
+# Change upgrade delay blocks.
+blocks=$(aurora-cli --engine $ENGINE_ACCOUNT get-upgrade-delay-blocks || error_exit)
+assert_eq "$blocks" 1 # 1 is set on init stage
+aurora-cli --engine $ENGINE_ACCOUNT set-upgrade-delay-blocks 5 || error_exit
+sleep 1
+blocks=$(aurora-cli --engine $ENGINE_ACCOUNT get-upgrade-delay-blocks || error_exit)
+assert_eq "$blocks" 5
+
+# Stop NEAR node and clean up.
+finish
diff --git a/scripts/simple-silo.sh b/scripts/simple-silo.sh
@@ -5,16 +5,17 @@ export NEARCORE_HOME="/tmp/localnet"
 EVM_CODE=$(cat docs/res/Counter.hex)
 ABI_PATH=docs/res/Counter.abi
 ENGINE_WASM_PATH="docs/res/aurora-mainnet-silo.wasm"
-USER_BASE_BIN=$(python3 -m site --user-base)/bin
 NODE_KEY_PATH=$NEARCORE_HOME/node0/validator_key.json
 AURORA_KEY_PATH=$NEARCORE_HOME/node0/aurora_key.json
 AURORA_SECRET_KEY=27cb3ddbd18037b38d7fb9ae3433a9d6f5cd554a4ba5768c8a15053f688ee167
 ENGINE_ACCOUNT=aurora.node0
+VENV=/tmp/venv
 
-export PATH="$PATH:$USER_BASE_BIN:$HOME/.cargo/bin"
 
 # Install `nearup` utility if not installed before.
-pip3 list | grep nearup > /dev/null || pip3 install --user nearup
+python3 -m venv $VENV
+source $VENV/bin/activate
+pip list | grep nearup > /dev/null || pip install nearup > /dev/null
 
 start_node() {
   cmd="nearup run localnet --home $NEARCORE_HOME"
@@ -34,7 +35,8 @@ finish() {
   # Stop NEAR node.
   stop_node
   # Cleanup
-  rm -rf $NEARCORE_HOME
+  deactivate
+  rm -rf $NEARCORE_HOME $VENV
 
   if [[ -z "$1" ]]; then
     exit 0