diff --git a/code/multisig/contracts/TwoUserMultisig.sol b/code/multisig/contracts/TwoUserMultisig.sol index 551c634..9a70273 100644 --- a/code/multisig/contracts/TwoUserMultisig.sol +++ b/code/multisig/contracts/TwoUserMultisig.sol @@ -110,7 +110,7 @@ contract TwoUserMultisig is IAccount, IERC1271 { uint32 gas = Utils.safeCastToU32(gasleft()); // Note, that the deployer contract can only be called - // with a "systemCall" flag. + // with a "enableEraVMExtensions" flag. SystemContractsCaller.systemCallWithPropagatedRevert(gas, to, value, data); } else { bool success; @@ -215,8 +215,8 @@ contract TwoUserMultisig is IAccount, IERC1271 { // since it is where the length of the `_fullSignature` is stored assembly { let r := mload(add(_fullSignature, 0x20)) - let s := mload(add(_fullSignature, 0x40)) - let v := and(mload(add(_fullSignature, 0x41)), 0xff) + let s := mload(add(_fullSignature, 0x40)) + let v := and(mload(add(_fullSignature, 0x41)), 0xff) mstore(add(signature1, 0x20), r) mstore(add(signature1, 0x40), s) diff --git a/code/multisig/deploy/deploy-factory.ts b/code/multisig/deploy/deploy-factory.ts index 452514f..a59870d 100644 --- a/code/multisig/deploy/deploy-factory.ts +++ b/code/multisig/deploy/deploy-factory.ts @@ -14,12 +14,17 @@ export default async function (hre: HardhatRuntimeEnvironment) { // Getting the bytecodeHash of the account const bytecodeHash = utils.hashBytecode(aaArtifact.bytecode); - const factory = await deployer.deploy(factoryArtifact, [bytecodeHash], undefined, [ - // Since the factory requires the code of the multisig to be available, - // we should pass it here as well. - aaArtifact.bytecode, - // eslint-disable-next-line @typescript-eslint/no-explicit-any - ] as any); + const factory = await deployer.deploy( + factoryArtifact, + [bytecodeHash], + undefined, + undefined, // Override transaction section + [ + // Since the factory requires the code of the multisig to be available, + // we need to pass it here as well. + aaArtifact.bytecode, + ] + ); const factoryAddress = await factory.getAddress();