Merge remote-tracking branch 'origin/master' into storage_deposit

Near-One · Apr 28, 2024 · 7f46720 · 7f46720
2 parents 031eafb + c3c946b
commit 7f46720
Show file tree

Hide file tree

Showing 14 changed files with 331 additions and 361 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,6 +9,7 @@ license = "CC0 1.0"
 [workspace.dependencies]
 aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.5.0", default-features = false }
 near-sdk = "4.1"
+near-plugins = { git = "https://github.com/aurora-is-near/near-plugins", tag = "v0.1.0" }
 near-primitives = "0.17"
 near-contract-standards = "4.1"
 byte-slice-cast = "1"

diff --git a/eth-connector-tests/Cargo.toml b/eth-connector-tests/Cargo.toml
@@ -28,8 +28,8 @@ hex = "0.4.3"
 ethabi = "18.0"
 rlp = { version = "0.5.0", default-features = false }
 aurora-engine-migration-tool = { git = "https://github.com/aurora-is-near/aurora-engine-migration-tool.git", tag = "0.2.2" }
-aurora-workspace-eth-connector = { git = "https://github.com/aurora-is-near/aurora-workspace.git", rev = "16d6263d6561cbc1f838016ae15416eadc88ec90" }
-aurora-workspace-utils = { git = "https://github.com/aurora-is-near/aurora-workspace.git", rev = "16d6263d6561cbc1f838016ae15416eadc88ec90" }
+aurora-workspace-eth-connector = { git = "https://github.com/aurora-is-near/aurora-workspace", rev = "1d883cd9695fbd82e2c3f024d3f127769a48dfeb" }
+aurora-workspace-utils = { git = "https://github.com/aurora-is-near/aurora-workspace", rev = "1d883cd9695fbd82e2c3f024d3f127769a48dfeb" }
 
 [features]
 migration-tests = []
diff --git a/eth-connector-tests/src/connector.rs b/eth-connector-tests/src/connector.rs
@@ -181,7 +181,7 @@ async fn test_withdraw_eth_from_near_engine() {
         .transact()
         .await
         .unwrap_err();
-    assert!(contract.check_error_message(&res, "ERR_ACCESS_RIGHT"));
+    assert!(contract.check_error_message(&res, "Method can be called only by aurora engine"));
 
     // The purpose of this withdraw variant is that it can withdraw on behalf of a user.
     // In this example the contract itself withdraws on behalf of the user
@@ -252,7 +252,10 @@ async fn test_deposit_eth_to_aurora_balance_total_supply() {
         .await
         .unwrap();
 
-    contract.call_deposit_eth_to_aurora().await.unwrap();
+    contract
+        .call_deposit_eth_to_aurora(&contract.contract)
+        .await
+        .unwrap();
     assert!(
         contract.call_is_used_proof(PROOF_DATA_ETH).await.unwrap(),
         "Expected not to fail because the proof should have been already used",
@@ -480,16 +483,18 @@ async fn test_set_and_check_engine_account() {
         .transact()
         .await
         .unwrap_err();
-    assert!(contract.check_error_message(&res, "ERR_ACCESS_RIGHT"));
+    assert!(contract.check_error_message(&res, "Insufficient permissions for method"));
 
     contract
         .set_and_check_access_right(user_acc.id())
         .await
         .unwrap();
 
-    let res = user_acc
+    let res = contract
+        .contract
         .set_engine_account(contract.contract.id())
         .max_gas()
+        .deposit(ONE_YOCTO)
         .transact()
         .await
         .unwrap();
@@ -639,32 +644,21 @@ async fn test_ft_transfer_call_without_relayer() {
 
 #[tokio::test]
 async fn test_admin_controlled_only_admin_can_pause() {
-    use aurora_eth_connector::admin_controlled::PAUSE_DEPOSIT;
-
     let contract = TestContract::new_with_custodian_and_owner(CUSTODIAN_ADDRESS, "owner.root")
         .await
         .unwrap();
     let owner_acc = contract.contract_account("owner").await.unwrap();
     let user_acc = contract.contract_account("eth_recipient").await.unwrap();
     let res = user_acc
-        .set_paused_flags(PAUSE_DEPOSIT)
+        .pa_pause_feature("deposit".to_string())
         .max_gas()
         .transact()
         .await
         .unwrap_err();
-    assert!(contract.check_error_message(&res, "ERR_ACCESS_RIGHT"));
-
-    let res = contract
-        .contract
-        .set_paused_flags(PAUSE_DEPOSIT)
-        .max_gas()
-        .transact()
-        .await
-        .unwrap();
-    assert!(res.is_success());
+    assert!(contract.check_error_message(&res, "Insufficient permissions for method"));
 
     let res = owner_acc
-        .set_paused_flags(PAUSE_DEPOSIT)
+        .pa_pause_feature("deposit".to_string())
         .max_gas()
         .transact()
         .await
@@ -674,8 +668,6 @@ async fn test_admin_controlled_only_admin_can_pause() {
 
 #[tokio::test]
 async fn test_admin_controlled_admin_can_perform_actions_when_paused() {
-    use aurora_eth_connector::admin_controlled::{PAUSE_DEPOSIT, PAUSE_WITHDRAW};
-
     // 1st deposit call when unpaused - should succeed
     let contract = TestContract::new_with_custodian_and_owner(CUSTODIAN_ADDRESS, "owner.root")
         .await
@@ -705,10 +697,18 @@ async fn test_admin_controlled_admin_can_perform_actions_when_paused() {
     assert_eq!(data.amount, withdraw_amount);
     assert_eq!(data.eth_custodian_address, custodian_addr);
 
+    let res = user_acc
+        .ft_transfer(&owner_acc.id().to_string(), U128(2 * withdraw_amount), None)
+        .max_gas()
+        .deposit(ONE_YOCTO)
+        .transact()
+        .await
+        .unwrap();
+    assert!(res.is_success());
+
     // Pause deposit
-    let res = contract
-        .contract
-        .set_paused_flags(PAUSE_DEPOSIT)
+    let res = owner_acc
+        .pa_pause_feature("deposit".to_string())
         .max_gas()
         .transact()
         .await
@@ -718,26 +718,38 @@ async fn test_admin_controlled_admin_can_perform_actions_when_paused() {
     // 2nd deposit call when paused, but the admin is calling it - should succeed
     // NB: We can use `PROOF_DATA_ETH` this will be just a different proof but the same deposit
     // method which should be paused
-    contract
+    owner_acc
         .set_engine_account(contract.contract.id())
+        .max_gas()
+        .deposit(ONE_YOCTO)
+        .transact()
+        .await
+        .unwrap();
+    contract
+        .call_deposit_eth_to_aurora(&owner_acc)
         .await
         .unwrap();
-    contract.call_deposit_eth_to_aurora().await.unwrap();
 
     // Pause withdraw
-    let res = contract
-        .contract
-        .set_paused_flags(PAUSE_WITHDRAW)
+    let res = owner_acc
+        .pa_pause_feature("withdraw".to_string())
+        .max_gas()
+        .transact()
+        .await
+        .unwrap();
+    assert!(res.is_success());
+
+    let res = owner_acc
+        .pa_pause_feature("engine_withdraw".to_string())
         .max_gas()
         .transact()
         .await
         .unwrap();
     assert!(res.is_success());
 
     // 2nd withdraw call when paused, but the admin is calling it - should succeed
-    let res = contract
-        .contract
-        .engine_withdraw(&sender_id, recipient_addr, withdraw_amount)
+    let res = owner_acc
+        .withdraw(recipient_addr, withdraw_amount)
         .max_gas()
         .deposit(ONE_YOCTO)
         .transact()
@@ -758,10 +770,10 @@ async fn test_admin_controlled_admin_can_perform_actions_when_paused() {
         .transact()
         .await
         .unwrap_err();
-    assert!(contract.check_error_message(&res, "ERR_ACCESS_RIGHT"));
+    assert!(contract.check_error_message(&res, "Pausable: Method is paused"));
 
     let res = owner_acc
-        .engine_withdraw(&sender_id, recipient_addr, withdraw_amount)
+        .withdraw(recipient_addr, withdraw_amount)
         .max_gas()
         .deposit(ONE_YOCTO)
         .transact()
@@ -809,8 +821,6 @@ async fn test_deposit_with_proof_lower_than_acceptance_height() {
 
 #[tokio::test]
 async fn test_deposit_pausability() {
-    use aurora_eth_connector::admin_controlled::{PAUSE_DEPOSIT, UNPAUSE_ALL};
-
     let contract = TestContract::new_with_custodian_and_owner(CUSTODIAN_ADDRESS, "owner.root")
         .await
         .unwrap();
@@ -819,7 +829,7 @@ async fn test_deposit_pausability() {
     let user_acc = contract.contract_account("eth_recipient").await.unwrap();
 
     contract
-        .set_and_check_access_right(user_acc.id())
+        .user_set_and_check_access_right(user_acc.id(), &owner_acc)
         .await
         .unwrap();
 
@@ -832,9 +842,8 @@ async fn test_deposit_pausability() {
     assert!(res.is_success());
 
     // Pause deposit
-    let res = contract
-        .contract
-        .set_paused_flags(PAUSE_DEPOSIT)
+    let res = owner_acc
+        .pa_pause_feature("deposit".to_string())
         .max_gas()
         .transact()
         .await
@@ -847,7 +856,7 @@ async fn test_deposit_pausability() {
         .user_deposit_with_proof(&user_acc, proof2)
         .await
         .unwrap_err();
-    assert!(contract.check_error_message(&res, "ERR_PAUSED"));
+    assert!(contract.check_error_message(&res, "Pausable: Method is paused"));
 
     let proof3 = contract.mock_proof(user_acc.id(), 30, 3, 0);
     let res = contract
@@ -857,9 +866,16 @@ async fn test_deposit_pausability() {
     assert!(res.is_success());
 
     // Unpause all
-    let res = contract
-        .contract
-        .set_paused_flags(UNPAUSE_ALL)
+    let res = owner_acc
+        .pa_unpause_feature("withdraw".to_string())
+        .max_gas()
+        .transact()
+        .await
+        .unwrap();
+    assert!(res.is_success());
+
+    let res = owner_acc
+        .pa_unpause_feature("deposit".to_string())
         .max_gas()
         .transact()
         .await
@@ -878,8 +894,6 @@ async fn test_deposit_pausability() {
 
 #[tokio::test]
 async fn test_withdraw_from_near_pausability() {
-    use aurora_eth_connector::admin_controlled::{PAUSE_WITHDRAW, UNPAUSE_ALL};
-
     let contract = TestContract::new().await.unwrap();
     contract.call_deposit_eth_to_near().await.unwrap();
     contract.call_deposit_contract().await.unwrap();
@@ -910,7 +924,7 @@ async fn test_withdraw_from_near_pausability() {
     // Pause withdraw
     let res = contract
         .contract
-        .set_paused_flags(PAUSE_WITHDRAW)
+        .pa_pause_feature("withdraw".to_string())
         .max_gas()
         .transact()
         .await
@@ -925,12 +939,21 @@ async fn test_withdraw_from_near_pausability() {
         .transact()
         .await
         .unwrap_err();
-    assert!(contract.check_error_message(&res, "WithdrawErrorPaused"));
+    assert!(contract.check_error_message(&res, "Pausable: Method is paused"));
 
     // Unpause all
     let res = contract
         .contract
-        .set_paused_flags(UNPAUSE_ALL)
+        .pa_unpause_feature("withdraw".to_string())
+        .max_gas()
+        .transact()
+        .await
+        .unwrap();
+    assert!(res.is_success());
+
+    let res = contract
+        .contract
+        .pa_unpause_feature("deposit".to_string())
         .max_gas()
         .transact()
         .await
@@ -1229,7 +1252,7 @@ async fn test_access_rights() {
         .transact()
         .await
         .unwrap_err();
-    assert!(contract.check_error_message(&res, "ERR_ACCESS_RIGHT"));
+    assert!(contract.check_error_message(&res, "Method can be called only by aurora engine"));
 
     assert_eq!(
         DEPOSITED_AMOUNT + transfer_amount1.0,
@@ -1261,8 +1284,7 @@ async fn test_access_rights() {
         .await
         .unwrap();
 
-    let res = contract
-        .contract
+    let res = user_acc
         .engine_withdraw(contract.contract.id(), recipient_addr, withdraw_amount)
         .max_gas()
         .deposit(ONE_YOCTO)
@@ -1350,7 +1372,7 @@ async fn test_engine_ft_transfer() {
         .transact()
         .await
         .unwrap_err();
-    assert!(contract.check_error_message(&res, "ERR_ACCESS_RIGHT"));
+    assert!(contract.check_error_message(&res, "Method can be called only by aurora engine"));
 
     assert_eq!(
         DEPOSITED_AMOUNT,
@@ -1428,7 +1450,7 @@ async fn test_engine_ft_transfer_call() {
         .transact()
         .await;
     if let Err(err) = res {
-        assert!(contract.check_error_message(&err, "ERR_ACCESS_RIGHT"));
+        assert!(contract.check_error_message(&err, "Method can be called only by aurora engine"));
     }
 
     assert_eq!(
@@ -1493,16 +1515,15 @@ async fn test_engine_storage_deposit() {
         .transact()
         .await;
     if let Err(err) = res {
-        assert!(contract.check_error_message(&err, "ERR_ACCESS_RIGHT"));
+        assert!(contract.check_error_message(&err, "Method can be called only by aurora engine"));
     }
 
     contract
         .set_and_check_access_right(user_acc.id())
         .await
         .unwrap();
 
-    let res = contract
-        .contract
+    let res = user_acc
         .engine_storage_deposit(user_acc.id(), Some(user_acc.id()), None)
         .max_gas()
         .deposit(NearToken::from_yoctonear(bounds.min.0))
@@ -1544,16 +1565,15 @@ async fn test_engine_storage_withdraw() {
         .transact()
         .await;
     if let Err(err) = res {
-        assert!(contract.check_error_message(&err, "ERR_ACCESS_RIGHT"));
+        assert!(contract.check_error_message(&err, "Method can be called only by aurora engine"));
     }
 
     contract
         .set_and_check_access_right(user_acc.id())
         .await
         .unwrap();
 
-    let res = contract
-        .contract
+    let res = user_acc
         .engine_storage_deposit(user_acc.id(), Some(user_acc.id()), None)
         .max_gas()
         .deposit(NearToken::from_yoctonear(bounds.min.0))
@@ -1596,15 +1616,14 @@ async fn test_engine_storage_unregister() {
         .transact()
         .await
         .unwrap_err();
-    assert!(contract.check_error_message(&res, "ERR_ACCESS_RIGHT"));
+    assert!(contract.check_error_message(&res, "Method can be called only by aurora engine"));
 
     contract
         .set_and_check_access_right(user_acc.id())
         .await
         .unwrap();
 
-    let res = contract
-        .contract
+    let res = user_acc
         .engine_storage_deposit(user_acc.id(), Some(user_acc.id()), None)
         .max_gas()
         .deposit(NearToken::from_yoctonear(bounds.min.0))
@@ -1678,6 +1697,7 @@ async fn test_manage_engine_accounts() {
         .contract
         .remove_engine_account(&acc1)
         .max_gas()
+        .deposit(ONE_YOCTO)
         .transact()
         .await
         .unwrap();