fix: update sdk to match latest contracts interface

matter-labs · Dec 11, 2024 · dc6e79a · dc6e79a
1 parent 841bfd5
commit dc6e79a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 20 deletions.
diff --git a/packages/auth-server/stores/client.ts b/packages/auth-server/stores/client.ts
@@ -27,10 +27,10 @@ export const contractsByChain: Record<SupportedChainId, ChainContracts> = {
     accountPaymaster: "0x0cE4c9b3eA74971210C114cc136eAE41148C8B5a",
   },
   [zksyncInMemoryNode.id]: {
-    session: "0x24ceE718D848063d09d2BeaCe31553524AcD366F",
-    passkey: "0x96b5403Bc85469AA3F387Bb468DFFd0fb8A3F767",
+    session: "0x62b019c03Db1f4d0C0b857fDabE4AbC9c60c2F70",
+    passkey: "0x21b8397BeF5128662564b8491676baa6754AFD47",
     accountFactory: "0xd7385ba726A7b72933E63FCb0Dfee8Bcae63478c",
-    accountPaymaster: "0x9966A2f99e4A7ae9FBd6b7111568219B7C0e8E27",
+    accountPaymaster: "0xAF34a25b78066f2442fb4d7cA740A03E47769b71",
   },
 };
 

diff --git a/packages/contracts b/packages/contracts
diff --git a/packages/sdk/src/abi/Factory.ts b/packages/sdk/src/abi/Factory.ts
@@ -102,11 +102,6 @@ export const FactoryAbi = [
         name: "_initialValidators",
         type: "bytes[]",
       },
-      {
-        internalType: "bytes[]",
-        name: "_initialHooks",
-        type: "bytes[]",
-      },
       {
         internalType: "address[]",
         name: "_initialK1Owners",

diff --git a/packages/sdk/src/client/passkey/actions/account.ts b/packages/sdk/src/client/passkey/actions/account.ts
@@ -93,7 +93,6 @@ export const deployAccount = async <
       toHex(args.salt),
       accountId,
       [encodedPasskeyModuleData, encodedSessionKeyModuleData],
-      [encodedSessionKeyModuleData],
       [],
     ],
   } as any;

diff --git a/packages/sdk/src/client/session/client.ts b/packages/sdk/src/client/session/client.ts
@@ -20,20 +20,17 @@ export const signSessionTransaction = (args: {
     [
       { type: "bytes", name: "sessionKeySignedHash" },
       { type: "address", name: "sessionContract" },
-      { type: "bytes[]", name: "hooks" },
+      { type: "bytes", name: "validatorData" },
     ],
     [
       args.sessionKeySignedHash,
       args.sessionContract,
-      [
-        encodeSessionTx({
-          sessionConfig: args.sessionConfig,
-          to: args.to,
-          callData: args.callData,
-          timestamp: args.timestamp,
-        }),
-        // TODO: this is assuming there are no other hooks
-      ],
+      encodeSessionTx({
+        sessionConfig: args.sessionConfig,
+        to: args.to,
+        callData: args.callData,
+        timestamp: args.timestamp,
+      }),
     ],
   );
 };
+1 −2		src/AAFactory.sol
+14 −24		src/SsoAccount.sol
+5 −2		src/handlers/ERC1271Handler.sol
+6 −3		src/handlers/ValidationHandler.sol
+1 −1		src/helpers/TimestampAsserterLocator.sol
+4 −1		src/interfaces/IHook.sol
+1 −1		src/interfaces/IHookManager.sol
+8 −1		src/interfaces/IModuleValidator.sol
+1 −5		src/interfaces/ISsoAccount.sol
+2 −2		src/libraries/SignatureDecoder.sol
+2 −15		src/managers/HookManager.sol
+32 −58		src/validators/SessionKeyValidator.sol
+12 −1		src/validators/WebAuthValidator.sol
+0 −1		test/BasicTest.ts
+29 −33		test/SessionKeyTest.ts