@skalenetwork/upgrade-tools 2.0.0-refactor.13 → 2.0.0-refactor.14

package/dist/src/gnosis-safe.js

@@ -92,8 +92,6 @@ function createMultiSendTransaction(ethers, safeAddress, privateKey, transaction
         const multiSendAddress = getMultiSendAddress(chainId);
         const multiSendAbi = [{ "constant": false, "inputs": [{ "internalType": "bytes", "name": "transactions", "type": "bytes" }], "name": "multiSend", "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function" }];
         const multiSend = new ethers.Contract(multiSendAddress, new ethers.utils.Interface(multiSendAbi), ethers.provider);
-        const safeAbi = [{ "constant": true, "inputs": [{ "internalType": "address", "name": "to", "type": "address" }, { "internalType": "uint256", "name": "value", "type": "uint256" }, { "internalType": "bytes", "name": "data", "type": "bytes" }, { "internalType": "enum Enum.Operation", "name": "operation", "type": "uint8" }, { "internalType": "uint256", "name": "safeTxGas", "type": "uint256" }, { "internalType": "uint256", "name": "baseGas", "type": "uint256" }, { "internalType": "uint256", "name": "gasPrice", "type": "uint256" }, { "internalType": "address", "name": "gasToken", "type": "address" }, { "internalType": "address", "name": "refundReceiver", "type": "address" }, { "internalType": "uint256", "name": "_nonce", "type": "uint256" }], "name": "getTransactionHash", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "payable": false, "stateMutability": "view", "type": "function" }];
-        const safe = new ethers.Contract(safeAddress, new ethers.utils.Interface(safeAbi), ethers.provider);
         let nonceValue = 0;
         if (nonce === undefined) {
             try {
@@ -141,7 +139,7 @@ function createMultiSendTransaction(ethers, safeAddress, privateKey, transaction
             "refundReceiver": ethers.constants.AddressZero,
             "nonce": nonceValue, // Nonce of the Safe, transaction cannot be executed until Safe's nonce is not equal to this nonce
         };
-        const digestHex = yield safe.getTransactionHash(tx.to, tx.value, tx.data, tx.operation, tx.safeTxGas, tx.baseGas, tx.gasPrice, tx.gasToken, tx.refundReceiver, tx.nonce);
+        const digestHex = getTransactionHash(tx.to, tx.value, tx.data, tx.operation, tx.safeTxGas, tx.baseGas, tx.gasPrice, tx.gasToken, tx.refundReceiver, tx.nonce, safeAddress, chainId);
         const privateKeyBuffer = ethUtil.toBuffer(privateKey);
         const { r, s, v } = ethUtil.ecsign(ethUtil.toBuffer(digestHex), privateKeyBuffer);
         const signature = ethUtil.toRpcSig(v, r, s).toString();
@@ -223,3 +221,45 @@ function getSafeNonceWithPending(chainId, safeAddress) {
         }
     });
 }
+function getDomainSeparator(safeAddress, chainId) {
+    const DOMAIN_SEPARATOR_TYPEHASH = "0x47e79534a245952e8b16893a336b85a3d9ea9fa8c573f3d803afb92a79469218";
+    return ethers_1.ethers.utils.solidityKeccak256(["bytes"], [
+        ethers_1.ethers.utils.defaultAbiCoder.encode(["bytes32", "uint256", "address"], [DOMAIN_SEPARATOR_TYPEHASH, chainId, safeAddress])
+    ]);
+}
+function encodeTransactionData(to, value, data, operation, safeTxGas, baseGas, gasPrice, gasToken, refundReceiver, _nonce, safeAddress, chainId) {
+    const dataHash = ethers_1.ethers.utils.solidityKeccak256(["bytes"], [data]);
+    const SAFE_TX_TYPEHASH = "0xbb8310d486368db6bd6f849402fdd73ad53d316b5a4b2644ad6efe0f941286d8";
+    const encoded = ethers_1.ethers.utils.defaultAbiCoder.encode([
+        "bytes32",
+        "address",
+        "uint256",
+        "bytes32",
+        "uint256",
+        "uint256",
+        "uint256",
+        "uint256",
+        "address",
+        "address",
+        "uint256"
+    ], [
+        SAFE_TX_TYPEHASH,
+        to,
+        value,
+        dataHash,
+        operation,
+        safeTxGas,
+        baseGas,
+        gasPrice,
+        gasToken,
+        refundReceiver,
+        _nonce
+    ]);
+    const encodedHash = ethers_1.ethers.utils.solidityKeccak256(["bytes"], [encoded]);
+    return ethers_1.ethers.utils.solidityPack(["bytes1", "bytes1", "bytes32", "bytes32"], ["0x19", "0x01", getDomainSeparator(safeAddress, chainId), encodedHash]);
+}
+function getTransactionHash(to, value, data, operation, safeTxGas, baseGas, gasPrice, gasToken, refundReceiver, _nonce, safeAddress, chainId) {
+    return ethers_1.ethers.utils.solidityKeccak256(["bytes"], [
+        encodeTransactionData(to, value, data, operation, safeTxGas, baseGas, gasPrice, gasToken, refundReceiver, _nonce, safeAddress, chainId)
+    ]);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skalenetwork/upgrade-tools",
-  "version": "2.0.0-refactor.13",
+  "version": "2.0.0-refactor.14",
   "description": "Scripts to support upgrades of smart contracts",
   "files": [
     "dist/**/*"