Merge branch 'fix/no-flz-for-use-mode'

Filipp Makarov · Filipp Makarov · commit d7e85c38c25b · 2024-11-13T11:57:22.000+03:00
diff --git a/contracts/SmartSession.sol b/contracts/SmartSession.sol
@@ -93,7 +93,7 @@ contract SmartSession is ISmartSession, SmartSessionBase, SmartSessionERC7739 {
                 permissionId: permissionId,
                 userOpHash: userOpHash,
                 userOp: userOp,
-                decompressedSignature: packedSig.decodeUse(),
+                decompressedSignature: packedSig,
                 account: account
             });
         }
diff --git a/contracts/lib/EncodeLib.sol b/contracts/lib/EncodeLib.sol
@@ -28,11 +28,7 @@ library EncodeLib {
     }
 
     function encodeUse(PermissionId permissionId, bytes memory sig) internal pure returns (bytes memory userOpSig) {
-        userOpSig = abi.encodePacked(SmartSessionMode.USE, permissionId, abi.encode(sig).flzCompress());
-    }
-
-    function decodeUse(bytes memory packedSig) internal pure returns (bytes memory signature) {
-        (signature) = abi.decode(packedSig.flzDecompress(), (bytes));
+        userOpSig = abi.encodePacked(SmartSessionMode.USE, permissionId, sig);
     }
 
     function encodeUnsafeEnable(

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ contract SmartSession is ISmartSession, SmartSessionBase, SmartSessionERC7739 {`
`93`	`93`	`permissionId: permissionId,`
`94`	`94`	`userOpHash: userOpHash,`
`95`	`95`	`userOp: userOp,`
`96`		`- decompressedSignature: packedSig.decodeUse(),`
	`96`	`+ decompressedSignature: packedSig,`
`97`	`97`	`account: account`
`98`	`98`	`});`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,7 @@ library EncodeLib {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`function encodeUse(PermissionId permissionId, bytes memory sig) internal pure returns (bytes memory userOpSig) {`
`31`		`- userOpSig = abi.encodePacked(SmartSessionMode.USE, permissionId, abi.encode(sig).flzCompress());`
`32`		`- }`
`33`		`-`
`34`		`- function decodeUse(bytes memory packedSig) internal pure returns (bytes memory signature) {`
`35`		`- (signature) = abi.decode(packedSig.flzDecompress(), (bytes));`
	`31`	`+ userOpSig = abi.encodePacked(SmartSessionMode.USE, permissionId, sig);`
`36`	`32`	`}`
`37`	`33`
`38`	`34`	`function encodeUnsafeEnable(`