Feat introduced icp nonces for context contract

Cargo.toml

@@ -41,7 +41,6 @@ members = [
 
     "./contracts/icp/context-config",
     "./contracts/icp/context-proxy",
-    "./contracts/icp/context-proxy/mock/ledger",
     "./contracts/icp/context-proxy/mock/external",
 
     "./e2e-tests",

contracts/icp/.gitignore

@@ -28,3 +28,4 @@ dist/
 pocket-ic
 
 !**/res/*.did
+**/canister_ids.json

contracts/icp/context-config/.env

@@ -1,7 +1,8 @@
 
 # DFX CANISTER ENVIRONMENT VARIABLES
-DFX_VERSION='0.24.2'
+DFX_VERSION='0.24.3'
 DFX_NETWORK='local'
+CANISTER_ID_LEDGER='bd3sg-teaaa-aaaaa-qaaba-cai'
 CANISTER_ID_CONTEXT_CONTRACT='bkyz2-fmaaa-aaaaa-qaaaq-cai'
 CANISTER_ID='bkyz2-fmaaa-aaaaa-qaaaq-cai'
 CANISTER_CANDID_PATH='/Users/alen/www/calimero/core/contracts/icp/context-config/./res/calimero_context_config_icp.did'

contracts/icp/context-config/deploy_devnet.sh

@@ -1,13 +1,125 @@
 #!/bin/bash
+set -e
 
-# Build the contract
-./build.sh
+# Function to generate a new identity and return its principal
+generate_identity() {
+    local name=$1
+    dfx identity new "$name" --storage-mode=plaintext || true
+    dfx identity use "$name"
+    dfx identity get-principal
+}
+
+# Function to get account ID from principal
+get_account_id() {
+    local principal=$1
+    dfx ledger account-id --of-principal "$principal"
+}
+
+# Generate minting account
+dfx identity new minting --storage-mode=plaintext || true
+dfx identity use minting
+MINTING_PRINCIPAL=$(dfx identity get-principal)
+MINTING_ACCOUNT=$(get_account_id "$MINTING_PRINCIPAL")
+
+# Generate initial account
+dfx identity new initial --storage-mode=plaintext || true
+dfx identity use initial
+INITIAL_PRINCIPAL=$(dfx identity get-principal)
+INITIAL_ACCOUNT=$(get_account_id "$INITIAL_PRINCIPAL")
+
+# Generate archive controller account
+dfx identity new archive --storage-mode=plaintext || true
+dfx identity use archive
+ARCHIVE_PRINCIPAL=$(dfx identity get-principal)
 
-# Stop the replica
+# Switch back to default identity
+dfx identity use default
+
+# Stop dfx and clean up all state
 dfx stop
+rm -rf .dfx
+rm -rf ~/.config/dfx/replica-configuration/
+rm -rf ~/.cache/dfinity/
+# Remove canister_ids.json if it exists
+if [ -f "canister_ids.json" ]; then
+    rm canister_ids.json
+fi
+
+# Start dfx with clean state
+dfx start --clean --background
+
+# Define canister IDs
+CONTEXT_ID="br5f7-7uaaa-aaaaa-qaaca-cai"
+LEDGER_ID="be2us-64aaa-aaaaa-qaabq-cai"
+
+# Create canisters
+echo "Creating canisters..."
+dfx canister create context_contract --specified-id "$CONTEXT_ID"
+dfx canister create ledger --specified-id "$LEDGER_ID"
+
+# Build contracts
+echo "Building contracts..."
+cd "$(dirname $0)"
+./build.sh
+cd ../context-proxy
+./build.sh
+cd ../context-config
+
+# Prepare ledger initialization argument
+LEDGER_INIT_ARG="(variant { Init = record { 
+    minting_account = \"${MINTING_ACCOUNT}\"; 
+    initial_values = vec { 
+        record { \"${INITIAL_ACCOUNT}\"; record { e8s = 100_000_000_000 } } 
+    }; 
+    send_whitelist = vec {}; 
+    transfer_fee = opt record { e8s = 10_000 }; 
+    token_symbol = opt \"LICP\"; 
+    token_name = opt \"Local Internet Computer Protocol Token\"; 
+    archive_options = opt record { 
+        trigger_threshold = 2000; 
+        num_blocks_to_archive = 1000; 
+        controller_id = principal \"${ARCHIVE_PRINCIPAL}\" 
+    }; 
+} })"
+
+# Build and install canisters
+dfx build
+dfx canister install context_contract --mode=install
+dfx canister install ledger --mode=install --argument "$LEDGER_INIT_ARG"
+
+# Get the directory where the script is located
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+
+# Build path relative to the script location
+WASM_FILE="${SCRIPT_DIR}/../context-proxy/res/calimero_context_proxy_icp.wasm"
+
+# Verify file exists
+if [ ! -f "$WASM_FILE" ]; then
+    echo "Error: WASM file not found at: $WASM_FILE"
+    exit 1
+fi
+
+# Then modify the script to use a consistent reading method
+WASM_CONTENTS=$(xxd -p "$WASM_FILE" | tr -d '\n' | sed 's/\(..\)/\\\1/g')
+
+TEMP_CMD=$(mktemp)
+echo "(
+  blob \"${WASM_CONTENTS}\",
+  principal \"${LEDGER_ID}\"
+)" > "$TEMP_CMD"
+
+# Execute the command using the temporary file
+dfx canister call context_contract set_proxy_code --argument-file "$TEMP_CMD"
 
-# Start the replica
-dfx start --background
+# Clean up
+rm "$TEMP_CMD"
 
-# Deploy the contract
-dfx deploy
+# Print all relevant information at the end
+echo -e "\n=== Deployment Summary ==="
+echo "Context Contract ID: ${CONTEXT_ID}"
+echo "Ledger Contract ID: ${LEDGER_ID}"
+echo -e "\nAccount Information:"
+echo "Minting Account: ${MINTING_ACCOUNT}"
+echo "Initial Account: ${INITIAL_ACCOUNT}"
+echo "Archive Principal: ${ARCHIVE_PRINCIPAL}"
+echo -e "\nDeployment completed successfully!"

contracts/icp/context-config/dfx.json

@@ -3,7 +3,14 @@
     "context_contract": {
       "package": "calimero-context-config-icp",
       "candid": "./res/calimero_context_config_icp.did",
-      "type": "rust"
+      "type": "rust",
+      "id": "br5f7-7uaaa-aaaaa-qaaca-cai"
+    },
+    "ledger": {
+      "type": "custom",
+      "wasm": "https://download.dfinity.systems/ic/aba60ffbc46acfc8990bf4d5685c1360bd7026b9/canisters/ledger-canister.wasm.gz",
+      "candid": "https://raw.githubusercontent.com/dfinity/ic/aba60ffbc46acfc8990bf4d5685c1360bd7026b9/rs/ledger_suite/icp/ledger.did",
+      "id": "be2us-64aaa-aaaaa-qaabq-cai"
     }
   },
   "defaults": {
@@ -12,6 +19,11 @@
       "packtool": ""
     }
   },
-  "output_env_file": ".env",
+  "networks": {
+    "local": {
+      "bind": "127.0.0.1:4943",
+      "type": "persistent"
+    }
+  },
   "version": 1
 }

contracts/icp/context-config/src/mutate.rs

@@ -185,8 +185,10 @@ fn add_members(
         let mut ctx_members = guard_ref.get_mut();
 
         for member in members {
-            ctx_members.insert(member);
-            let _ignored = context.member_nonces.entry(member).or_default();
+            if ctx_members.insert(member) {
+                // returns true if the value was newly inserted
+                let _ignored = context.member_nonces.entry(member).or_default();
+            }
         }
 
         Ok(())

contracts/icp/context-proxy/Cargo.toml

@@ -21,3 +21,5 @@ thiserror.workspace = true
 [dev-dependencies]
 pocket-ic = "6.0.0"
 rand = "0.8"
+reqwest = { version = "0.10.10", features = ["blocking"] }
+flate2 = "1.0.35"

contracts/icp/context-proxy/build_contracts.sh

@@ -6,9 +6,6 @@ cd "$(dirname $0)"
 echo "Building proxy contract..."
 ./build.sh
 
-echo "Building mock ledger contract..."
-./mock/ledger/build.sh
-
 echo "Building mock external contract..."
 ./mock/external/build.sh
 

contracts/icp/context-proxy/dfx.json

@@ -5,12 +5,6 @@
       "candid": "./res/calimero_context_proxy_icp.did",
       "type": "rust"
     },
-    "mock_ledger": {
-      "type": "rust",
-      "package": "calimero-mock-ledger-icp",
-      "candid": "./mock/ledger/res/calimero_mock_ledger_icp.did",
-      "path": "mock/ledger"
-    },
     "mock_external": {
       "type": "rust",
       "package": "calimero-mock-external-icp",
@@ -24,6 +18,12 @@
       "packtool": ""
     }
   },
+  "networks": {
+    "local": {
+      "bind": "127.0.0.1:4943",
+      "type": "persistent"
+    }
+  },
   "output_env_file": ".env",
   "version": 1
 }

contracts/icp/context-proxy/mock/external/Cargo.toml

@@ -10,3 +10,4 @@ crate-type = ["cdylib"]
 candid = "0.10"
 ic-cdk = "0.16"
 ic-cdk-macros = "0.16"
+ic-ledger-types = "0.14.0"

contracts/icp/context-proxy/mock/external/res/calimero_mock_external_icp.did

@@ -1 +1,6 @@
-service : { get_calls : () -> (vec blob) query; test_method : (blob) -> (blob) }
+service : (principal) -> {
+  clear_state : () -> ();
+  get_calls : () -> (vec blob) query;
+  test_method : (blob) -> (blob);
+  test_method_no_transfer : (blob) -> (blob);
+}

contracts/icp/context-proxy/mock/external/src/lib.rs

@@ -1,20 +1,76 @@
 use std::cell::RefCell;
 
+use candid::Principal;
+use ic_ledger_types::{AccountIdentifier, Memo, Subaccount, Tokens, TransferArgs, TransferError};
+
 thread_local! {
     static CALLS: RefCell<Vec<Vec<u8>>> = RefCell::new(Vec::new());
+    static LEDGER_ID: RefCell<Option<Principal>> = RefCell::new(None);
+}
+
+#[ic_cdk::init]
+fn init(ledger_id: Principal) {
+    LEDGER_ID.with(|id| {
+        *id.borrow_mut() = Some(ledger_id);
+    });
 }
 
 #[ic_cdk::update]
-fn test_method(args: Vec<u8>) -> Vec<u8> {
+async fn test_method(args: Vec<u8>) -> Vec<u8> {
+    let self_id = ic_cdk::id();
+    let caller = ic_cdk::caller();
+
+    let ledger_id = LEDGER_ID.with(|id| id.borrow().expect("Ledger ID not initialized"));
+
+    // Prepare transfer args to move the approved tokens
+    let transfer_args = TransferArgs {
+        memo: Memo(0),
+        amount: Tokens::from_e8s(100_000_000), // Example amount, in practice this would be parsed from args
+        fee: Tokens::from_e8s(10_000),
+        from_subaccount: Some(Subaccount::from(caller)),
+        to: AccountIdentifier::new(&self_id, &Subaccount([0; 32])),
+        created_at_time: None,
+    };
+
+    // Execute the transfer with proper type annotations
+    let transfer_result: Result<(Result<u64, TransferError>,), _> =
+        ic_cdk::call(ledger_id, "transfer", (transfer_args,)).await;
+
+    match transfer_result {
+        Ok((Ok(_block_height),)) => {
+            // Transfer successful, record the call
+            CALLS.with(|calls| {
+                calls.borrow_mut().push(args.clone());
+            });
+            args // Return the same args back
+        }
+        Ok((Err(transfer_error),)) => {
+            ic_cdk::trap(&format!("Transfer failed: {:?}", transfer_error));
+        }
+        Err(e) => {
+            ic_cdk::trap(&format!("Call to ledger failed: {:?}", e));
+        }
+    }
+}
+
+#[ic_cdk::update]
+async fn test_method_no_transfer(args: Vec<u8>) -> Vec<u8> {
+    // Simply record the call and return
     CALLS.with(|calls| {
         calls.borrow_mut().push(args.clone());
-        args // Return the same args back
-    })
+    });
+    args
 }
 
 #[ic_cdk::query]
 fn get_calls() -> Vec<Vec<u8>> {
     CALLS.with(|calls| calls.borrow().clone())
 }
 
+// Clear state (useful for testing)
+#[ic_cdk::update]
+fn clear_state() {
+    CALLS.with(|calls| calls.borrow_mut().clear());
+}
+
 ic_cdk::export_candid!();