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

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/dist/src/submitters/auto-submitter.d.ts

@@ -1,5 +1,10 @@
 import { UnsignedTransaction } from "ethers";
 import { Submitter } from "./submitter";
+import { SkaleABIFile } from "../types/SkaleABIFile";
 export declare class AutoSubmitter extends Submitter {
     submit(transactions: UnsignedTransaction[]): Promise<void>;
+    _getImaAbi(): Promise<SkaleABIFile>;
+    _getSafeAddress(): string;
+    _getSchainHash(): string;
+    _getMainnetChainId(): number;
 }

package/dist/src/submitters/auto-submitter.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -15,9 +38,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AutoSubmitter = void 0;
 const admin_1 = require("@openzeppelin/hardhat-upgrades/dist/admin");
 const submitter_1 = require("./submitter");
-const hardhat_1 = __importDefault(require("hardhat"));
+const hardhat_1 = __importStar(require("hardhat"));
 const eoa_submitter_1 = require("./eoa-submitter");
 const safe_submitter_1 = require("./safe-submitter");
+const chalk_1 = __importDefault(require("chalk"));
+const safe_ima_legacy_marionette_submitter_1 = require("./safe-ima-legacy-marionette-submitter");
+const fs_1 = require("fs");
 class AutoSubmitter extends submitter_1.Submitter {
     submit(transactions) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -30,11 +56,65 @@ class AutoSubmitter extends submitter_1.Submitter {
             }
             else {
                 console.log("Owner is a contract");
-                // TODO: add support of Marionette
-                submitter = new safe_submitter_1.SafeSubmitter(owner);
+                if (hardhat_1.ethers.utils.getAddress(owner) == hardhat_1.ethers.utils.getAddress("0xD2c0DeFACe000000000000000000000000000000")) {
+                    console.log("Marionette owner is detected");
+                    const imaAbi = yield this._getImaAbi();
+                    const safeAddress = this._getSafeAddress();
+                    const schainHash = this._getSchainHash();
+                    const mainnetChainId = this._getMainnetChainId();
+                    submitter = new safe_ima_legacy_marionette_submitter_1.SafeImaLegacyMarionetteSubmitter(safeAddress, imaAbi, schainHash, mainnetChainId);
+                }
+                else {
+                    // assuming owner is a Gnosis Safe
+                    console.log("Using Gnosis Safe");
+                    submitter = new safe_submitter_1.SafeSubmitter(owner);
+                }
             }
             yield submitter.submit(transactions);
         });
     }
+    // private
+    _getImaAbi() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!process.env.IMA_ABI) {
+                console.log(chalk_1.default.red("Set path to ima abi to IMA_ABI environment variable"));
+                process.exit(1);
+            }
+            return JSON.parse(yield fs_1.promises.readFile(process.env.IMA_ABI, "utf-8"));
+        });
+    }
+    _getSafeAddress() {
+        if (!process.env.SAFE_ADDRESS) {
+            console.log(chalk_1.default.red("Set Gnosis Safe owner address to SAFE_ADDRESS environment variable"));
+            process.exit(1);
+        }
+        return process.env.SAFE_ADDRESS;
+    }
+    _getSchainHash() {
+        // query Context to get schain hash
+        if (!process.env.SCHAIN_HASH) {
+            if (!process.env.SCHAIN_NAME) {
+                console.log(chalk_1.default.red("Set schain name to SCHAIN_NAME environment variable"));
+                console.log(chalk_1.default.red("or schain hash to SCHAIN_HASH environment variable"));
+                process.exit(1);
+            }
+            else {
+                return hardhat_1.ethers.utils.solidityKeccak256(["string"], [process.env.SCHAIN_NAME]);
+            }
+        }
+        else {
+            return process.env.SCHAIN_HASH;
+        }
+    }
+    _getMainnetChainId() {
+        if (!process.env.MAINNET_CHAIN_ID) {
+            console.log(chalk_1.default.red("Set chainId of mainnet to MAINNET_CHAIN_ID environment variable"));
+            console.log(chalk_1.default.red("Use 1 for Ethereum mainnet or 5 for Goerli"));
+            process.exit(1);
+        }
+        else {
+            return Number.parseInt(process.env.MAINNET_CHAIN_ID);
+        }
+    }
 }
 exports.AutoSubmitter = AutoSubmitter;

package/package.json

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