dfinity
diff --git a/‎.github/workflows/icrc2-swap.yml‎
Lines changed: 28 additions & 0 deletions b/‎.github/workflows/icrc2-swap.yml‎
Lines changed: 28 additions & 0 deletions
diff --git a/‎.github/workflows/motoko-icrc2-swap-example.yml‎
Lines changed: 0 additions & 29 deletions b/‎.github/workflows/motoko-icrc2-swap-example.yml‎
Lines changed: 0 additions & 29 deletions
diff --git a/‎motoko/icrc2-swap/.gitignore‎
Lines changed: 0 additions & 34 deletions b/‎motoko/icrc2-swap/.gitignore‎
Lines changed: 0 additions & 34 deletions
diff --git a/‎motoko/icrc2-swap/.prettierignore‎
Lines changed: 0 additions & 3 deletions b/‎motoko/icrc2-swap/.prettierignore‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎motoko/icrc2-swap/.prettierrc‎
Lines changed: 0 additions & 3 deletions b/‎motoko/icrc2-swap/.prettierrc‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎motoko/icrc2-swap/Makefile‎
Lines changed: 139 additions & 4 deletions b/‎motoko/icrc2-swap/Makefile‎
Lines changed: 139 additions & 4 deletions
@@ -0,0 +1,28 @@
+name: icrc2-swap
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    paths:
+      - motoko/icrc2-swap/**
+      - .github/workflows/icrc2-swap.yml
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  motoko-icrc2-swap:
+    runs-on: ubuntu-24.04
+    container: ghcr.io/dfinity/icp-dev-env-motoko:0.3.2
+    env:
+      ICP_CLI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+      - name: Deploy and test
+        working-directory: motoko/icrc2-swap
+        run: |
+          icp network start -d
+          make deploy
+          make test
@@ -1,6 +1,141 @@
-.PHONY: test
+.PHONY: deploy test
 
+# Deploy all canisters in the correct order:
+# 1. Create example-specific test identities (icrc2-alice, icrc2-bob) if not present.
+# 2. Deploy token_a (pre-funded for alice) and token_b (pre-funded for bob).
+# 3. Deploy backend — discovers token principals automatically via env vars.
+#
+# Note: use `make deploy` (not `icp deploy`) — the ledger canisters require
+# init args with alice/bob principals that are only available after the
+# identities are created.
+deploy:
+	@set -e; \
+	MINTER=$$(icp identity principal); \
+	icp identity new icrc2-alice --storage plaintext 2>/dev/null || true; \
+	icp identity new icrc2-bob   --storage plaintext 2>/dev/null || true; \
+	ALICE=$$(icp identity principal --identity icrc2-alice); \
+	BOB=$$(icp identity principal --identity icrc2-bob); \
+	icp deploy token_a --mode reinstall -y --args "(variant { Init = record { \
+	  token_name = \"Token A\"; token_symbol = \"A\"; \
+	  minting_account = record { owner = principal \"$$MINTER\" }; \
+	  initial_balances = vec { record { record { owner = principal \"$$ALICE\" }; 100_000_000_000_000 : nat } }; \
+	  metadata = vec {}; transfer_fee = 10_000 : nat; \
+	  archive_options = record { trigger_threshold = 2000 : nat64; num_blocks_to_archive = 1000 : nat64; controller_id = principal \"$$MINTER\" }; \
+	  feature_flags = opt record { icrc2 = true } } })"; \
+	icp deploy token_b --mode reinstall -y --args "(variant { Init = record { \
+	  token_name = \"Token B\"; token_symbol = \"B\"; \
+	  minting_account = record { owner = principal \"$$MINTER\" }; \
+	  initial_balances = vec { record { record { owner = principal \"$$BOB\" }; 100_000_000_000_000 : nat } }; \
+	  metadata = vec {}; transfer_fee = 10_000 : nat; \
+	  archive_options = record { trigger_threshold = 2000 : nat64; num_blocks_to_archive = 1000 : nat64; controller_id = principal \"$$MINTER\" }; \
+	  feature_flags = opt record { icrc2 = true } } })"; \
+	icp deploy backend --mode reinstall -y
+
+# Full integration test: icrc2-alice deposits token_a, icrc2-bob deposits token_b,
+# they swap 1:1, and each withdraws the other's token.
 test:
-	./test/deploy.sh
-	dfx generate
-	npm run test
+	$(eval TOKEN_A := $(shell icp canister status token_a -i))
+	$(eval TOKEN_B := $(shell icp canister status token_b -i))
+	$(eval ALICE := $(shell icp identity principal --identity icrc2-alice))
+	$(eval BOB   := $(shell icp identity principal --identity icrc2-bob))
+	$(eval SWAP  := $(shell icp canister status backend -i))
+
+	@echo "=== Test 1: balances returns empty lists initially ==="
+	@result=$$(icp canister call --query backend balances '()') && \
+	  echo "$$result" && \
+	  echo "$$result" | grep -q 'vec {}' && \
+	  echo "PASS" || (echo "FAIL" && exit 1)
+
+	@echo "=== Test 2: swap with no deposits returns InsufficientBalance ==="
+	@result=$$(icp canister call backend swap "(record { \
+	  user_a = principal \"$(ALICE)\"; \
+	  user_b = principal \"$(BOB)\" \
+	})") && \
+	  echo "$$result" && \
+	  echo "$$result" | grep -q 'InsufficientBalance' && \
+	  echo "PASS" || (echo "FAIL" && exit 1)
+
+	@echo "=== Test 3: icrc2-alice approves and deposits token_a ==="
+	@# Approve amount = deposit (100_000_000) + transfer_fee (10_000) = 100_010_000.
+	@# The ledger charges a fee on icrc2_transfer_from, so the approval must cover it.
+	@icp canister call --identity icrc2-alice token_a icrc2_approve "(record { \
+	  amount = 100_010_000 : nat; \
+	  spender = record { owner = principal \"$(SWAP)\"; subaccount = null }; \
+	  expires_at = null; expected_allowance = null; fee = null; \
+	  from_subaccount = null; memo = null; created_at_time = null \
+	})"
+	@result=$$(icp canister call --identity icrc2-alice backend deposit "(record { \
+	  token = principal \"$(TOKEN_A)\"; \
+	  from = record { owner = principal \"$(ALICE)\"; subaccount = null }; \
+	  amount = 100_000_000 : nat; \
+	  spender_subaccount = null; fee = null; memo = null; created_at_time = null \
+	})") && \
+	  echo "$$result" && \
+	  echo "$$result" | grep -q 'ok' && \
+	  echo "PASS" || (echo "FAIL" && exit 1)
+
+	@echo "=== Test 4: icrc2-bob approves and deposits token_b ==="
+	@icp canister call --identity icrc2-bob token_b icrc2_approve "(record { \
+	  amount = 100_010_000 : nat; \
+	  spender = record { owner = principal \"$(SWAP)\"; subaccount = null }; \
+	  expires_at = null; expected_allowance = null; fee = null; \
+	  from_subaccount = null; memo = null; created_at_time = null \
+	})"
+	@result=$$(icp canister call --identity icrc2-bob backend deposit "(record { \
+	  token = principal \"$(TOKEN_B)\"; \
+	  from = record { owner = principal \"$(BOB)\"; subaccount = null }; \
+	  amount = 100_000_000 : nat; \
+	  spender_subaccount = null; fee = null; memo = null; created_at_time = null \
+	})") && \
+	  echo "$$result" && \
+	  echo "$$result" | grep -q 'ok' && \
+	  echo "PASS" || (echo "FAIL" && exit 1)
+
+	@echo "=== Test 5: swap alice's token_a for bob's token_b ==="
+	@result=$$(icp canister call backend swap "(record { \
+	  user_a = principal \"$(ALICE)\"; \
+	  user_b = principal \"$(BOB)\" \
+	})") && \
+	  echo "$$result" && \
+	  echo "$$result" | grep -q 'ok' && \
+	  echo "PASS" || (echo "FAIL" && exit 1)
+
+	@echo "=== Test 6: alice withdraws token_b (received via swap) ==="
+	@# The backend deducts (amount + transfer_fee) from alice's internal balance.
+	@# Internal balance = 100_000_000; withdraw 99_990_000 so deduction = 99_990_000 + 10_000 = 100_000_000.
+	@set -e; \
+	  before=$$(icp canister call --query token_b icrc1_balance_of \
+	    "(record { owner = principal \"$(ALICE)\"; subaccount = null })" | grep -oE '[0-9_]+' | tr -d '_'); \
+	  result=$$(icp canister call --identity icrc2-alice backend withdraw "(record { \
+	    token = principal \"$(TOKEN_B)\"; \
+	    to = record { owner = principal \"$(ALICE)\"; subaccount = null }; \
+	    amount = 99_990_000 : nat; \
+	    fee = null; memo = null; created_at_time = null \
+	  })"); \
+	  echo "$$result"; \
+	  echo "$$result" | grep -q 'ok' || (echo "FAIL" && exit 1); \
+	  after=$$(icp canister call --query token_b icrc1_balance_of \
+	    "(record { owner = principal \"$(ALICE)\"; subaccount = null })" | grep -oE '[0-9_]+' | tr -d '_'); \
+	  delta=$$((after - before)); \
+	  echo "token_b balance: before=$$before after=$$after delta=$$delta"; \
+	  [ "$$delta" -eq 99990000 ] || (echo "FAIL: expected delta 99990000" && exit 1); \
+	  echo "PASS"
+
+	@echo "=== Test 7: bob withdraws token_a (received via swap) ==="
+	@set -e; \
+	  before=$$(icp canister call --query token_a icrc1_balance_of \
+	    "(record { owner = principal \"$(BOB)\"; subaccount = null })" | grep -oE '[0-9_]+' | tr -d '_'); \
+	  result=$$(icp canister call --identity icrc2-bob backend withdraw "(record { \
+	    token = principal \"$(TOKEN_A)\"; \
+	    to = record { owner = principal \"$(BOB)\"; subaccount = null }; \
+	    amount = 99_990_000 : nat; \
+	    fee = null; memo = null; created_at_time = null \
+	  })"); \
+	  echo "$$result"; \
+	  echo "$$result" | grep -q 'ok' || (echo "FAIL" && exit 1); \
+	  after=$$(icp canister call --query token_a icrc1_balance_of \
+	    "(record { owner = principal \"$(BOB)\"; subaccount = null })" | grep -oE '[0-9_]+' | tr -d '_'); \
+	  delta=$$((after - before)); \
+	  echo "token_a balance: before=$$before after=$$after delta=$$delta"; \
+	  [ "$$delta" -eq 99990000 ] || (echo "FAIL: expected delta 99990000" && exit 1); \
+	  echo "PASS"