feat(account-abstraction): add xdr encode decode utils

contracts/README.md

@@ -62,7 +62,6 @@ Run tests with output:
 cargo test -- --nocapture
 ```
 
-
 ### Prerequisites
 
 - Rust toolchain (1.74.0+)
@@ -92,19 +91,25 @@ make deploy-testnet  # Deploy contract to Soroban testnet
 #### Example Workflow
 
 1. Build and optimize contract:
-  ```bash
-  make build
-  make optimize
-  ```
+
+```bash
+make build
+make optimize
+```
+
 2. Setup local sandbox (optional):
-  ```bash
-  bash scripts/setup-local.sh
-  ```
+
+```bash
+bash scripts/setup-local.sh
+```
+
 3. Deploy to testnet:
-  ```bash
-  make deploy-testnet
-  ```
-  - Contract ID will be written to `contract-deployment.json`.
+
+```bash
+make deploy-testnet
+```
+
+- Contract ID will be written to `contract-deployment.json`.
 
 #### Environment Variables
 
@@ -113,11 +118,13 @@ make deploy-testnet  # Deploy contract to Soroban testnet
 #### Manual Steps (for reference)
 
 You can still use Soroban CLI directly for custom deployments:
+
 ```bash
 soroban contract build
 soroban contract optimize --wasm target/wasm32-unknown-unknown/release/ancore_account.wasm
 soroban contract deploy --wasm target/wasm32-unknown-unknown/release/ancore_account.optimized.wasm --source <deployer> --network testnet
 ```
+
 - Ed25519 validation (native Stellar)
 - Multi-signature
 - WebAuthn support

contracts/account/src/lib.rs

@@ -159,6 +159,10 @@ impl AncoreAccount {
         }
 
 
+        if current_nonce != expected_nonce {
+            return Err(ContractError::InvalidNonce);
+        }
+
         // Increment nonce
         env.storage().instance().set(&DataKey::Nonce, &(current_nonce + 1));
 
@@ -439,7 +443,7 @@ mod test {
     }
 
     #[test]
-    #[should_panic(expected = "Invalid nonce")]
+    #[should_panic(expected = "Error(Contract, #4)")]
     fn test_execute_rejects_invalid_nonce() {
         let env = Env::default();
         let contract_id = env.register_contract(None, AncoreAccount);

contracts/account/test_snapshots/test/test_add_session_key.1.json

@@ -452,4 +452,4 @@
       "failed_call": false
     }
   ]
-}
+}

contracts/account/test_snapshots/test/test_add_session_key_emits_event.1.json

@@ -377,4 +377,4 @@
       "failed_call": false
     }
   ]
-}
+}

contracts/account/test_snapshots/test/test_double_initialize.1.json

@@ -3,10 +3,7 @@
     "address": 2,
     "nonce": 0
   },
-  "auth": [
-    [],
-    []
-  ],
+  "auth": [[], []],
   "ledger": {
     "protocol_version": 21,
     "sequence_number": 0,
@@ -306,4 +303,4 @@
       "failed_call": false
     }
   ]
-}
+}

contracts/account/test_snapshots/test/test_execute_emits_event.1.json

@@ -318,4 +318,4 @@
       "failed_call": false
     }
   ]
-}
+}

contracts/account/test_snapshots/test/test_execute_rejects_invalid_nonce.1.json

@@ -3,10 +3,7 @@
     "address": 3,
     "nonce": 0
   },
-  "auth": [
-    [],
-    []
-  ],
+  "auth": [[], []],
   "ledger": {
     "protocol_version": 21,
     "sequence_number": 0,
@@ -213,27 +210,16 @@
           "v0": {
             "topics": [
               {
-                "symbol": "log"
+                "symbol": "fn_return"
+              },
+              {
+                "symbol": "execute"
               }
             ],
             "data": {
-              "vec": [
-                {
-                  "string": "caught panic 'Invalid nonce' from contract function 'Symbol(execute)'"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
-                },
-                {
-                  "symbol": "transfer"
-                },
-                {
-                  "vec": []
-                },
-                {
-                  "u64": 1
-                }
-              ]
+              "error": {
+                "contract": 4
+              }
             }
           }
         }
@@ -253,12 +239,12 @@
               },
               {
                 "error": {
-                  "wasm_vm": "invalid_action"
+                  "contract": 4
                 }
               }
             ],
             "data": {
-              "string": "caught error from function"
+              "string": "escalating Ok(ScErrorType::Contract) frame-exit to Err"
             }
           }
         }
@@ -278,7 +264,7 @@
               },
               {
                 "error": {
-                  "wasm_vm": "invalid_action"
+                  "contract": 4
                 }
               }
             ],
@@ -326,7 +312,7 @@
               },
               {
                 "error": {
-                  "wasm_vm": "invalid_action"
+                  "contract": 4
                 }
               }
             ],
@@ -339,4 +325,4 @@
       "failed_call": false
     }
   ]
-}
+}

contracts/account/test_snapshots/test/test_execute_validates_nonce_then_increments.1.json

@@ -446,4 +446,4 @@
       "failed_call": false
     }
   ]
-}
+}

contracts/account/test_snapshots/test/test_initialize.1.json

@@ -3,11 +3,7 @@
     "address": 2,
     "nonce": 0
   },
-  "auth": [
-    [],
-    [],
-    []
-  ],
+  "auth": [[], [], []],
   "ledger": {
     "protocol_version": 21,
     "sequence_number": 0,
@@ -261,4 +257,4 @@
       "failed_call": false
     }
   ]
-}
+}

contracts/account/test_snapshots/test/test_initialize_emits_event.1.json

@@ -3,9 +3,7 @@
     "address": 2,
     "nonce": 0
   },
-  "auth": [
-    []
-  ],
+  "auth": [[]],
   "ledger": {
     "protocol_version": 21,
     "sequence_number": 0,
@@ -165,4 +163,4 @@
       "failed_call": false
     }
   ]
-}
+}

contracts/account/test_snapshots/test/test_revoke_session_key_emits_event.1.json

@@ -426,4 +426,4 @@
       "failed_call": false
     }
   ]
-}
+}

docs/PULL_REQUEST_WORKFLOW.md

@@ -42,8 +42,8 @@ git branch -d feat/your-feature-name   # optional: delete local branch
 
 ## Branch naming
 
-- `feat/thing` — new feature  
-- `fix/thing` — bugfix  
-- `chore/thing` — config, deps, tooling  
+- `feat/thing` — new feature
+- `fix/thing` — bugfix
+- `chore/thing` — config, deps, tooling
 
 Example: `feat/contract-execute-nonce`, `fix/account-abstraction-types`.

packages/account-abstraction/eslint.config.cjs

@@ -12,6 +12,10 @@ module.exports = [
         ecmaVersion: 2020,
         sourceType: 'module',
       },
+      globals: {
+        Buffer: 'readonly',
+        TextEncoder: 'readonly',
+      },
     },
     plugins: {
       '@typescript-eslint': tseslint,
@@ -21,4 +25,16 @@ module.exports = [
       '@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '^_' }],
     },
   },
+  {
+    files: ['src/__tests__/**/*.ts'],
+    languageOptions: {
+      globals: {
+        describe: 'readonly',
+        beforeEach: 'readonly',
+        it: 'readonly',
+        expect: 'readonly',
+        jest: 'readonly',
+      },
+    },
+  },
 ];

packages/account-abstraction/package.json

@@ -6,11 +6,11 @@
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "scripts": {
-  "build": "tsup src/index.ts --format cjs,esm --dts --tsconfig tsconfig.json",
-  "dev": "tsup src/index.ts --format cjs,esm --dts --watch",
-  "test": "jest",
-  "lint": "eslint src/",
-  "clean": "rm -rf dist"
+    "build": "tsup src/index.ts --format cjs,esm --dts --tsconfig tsconfig.json",
+    "dev": "tsup src/index.ts --format cjs,esm --dts --watch",
+    "test": "jest",
+    "lint": "eslint src/",
+    "clean": "rm -rf dist"
   },
   "keywords": [
     "ancore",

packages/account-abstraction/src/__tests__/account-contract.test.ts

@@ -50,10 +50,7 @@ describe('AccountContract', () => {
     it('returns method and to, function, args, expectedNonce', () => {
       const to = 'CDLZFC3SYJYDZT7K67VZ75HPJVIEUVNIXF47ZG2FB2RMQQVU2HHGCYSC';
       const fn = 'transfer';
-      const args: xdr.ScVal[] = [
-        new Address(OWNER_ADDRESS).toScVal(),
-        xdr.ScVal.scvU32(100),
-      ];
+      const args: xdr.ScVal[] = [new Address(OWNER_ADDRESS).toScVal(), xdr.ScVal.scvU32(100)];
       const inv = contract.execute(to, fn, args, 0);
       expect(inv.method).toBe('execute');
       expect(inv.args).toHaveLength(4);
@@ -215,9 +212,7 @@ describe('XDR encoding helpers', () => {
     });
 
     it('throws for wrong byte length', () => {
-      expect(() =>
-        publicKeyToBytes32ScVal(new Uint8Array(16))
-      ).toThrow(TypeError);
+      expect(() => publicKeyToBytes32ScVal(new Uint8Array(16))).toThrow(TypeError);
     });
   });