@skalenetwork/upgrade-tools 2.0.1-develop.2 → 2.0.1-develop.4

package/dist/src/gnosis-safe.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,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createMultiSendTransaction = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const hardhat_1 = require("hardhat");
-const safe_ethers_lib_1 = __importDefault(require("@safe-global/safe-ethers-lib"));
-const safe_service_client_1 = __importDefault(require("@safe-global/safe-service-client"));
-const safe_core_sdk_1 = __importDefault(require("@safe-global/safe-core-sdk"));
+const api_kit_1 = __importDefault(require("@safe-global/api-kit"));
+const protocol_kit_1 = __importStar(require("@safe-global/protocol-kit"));
 var Network;
 (function (Network) {
     Network[Network["MAINNET"] = 1] = "MAINNET";
@@ -48,15 +70,15 @@ function createMultiSendTransaction(safeAddress, transactions) {
         const nonce = yield safeService.getNextNonce(safeAddress);
         console.log("Will send tx to Gnosis with nonce", nonce);
         const options = {
-            safeTxGas: 0,
-            baseGas: 0,
-            gasPrice: 0,
+            safeTxGas: "0",
+            baseGas: "0",
+            gasPrice: "0",
             gasToken: hardhat_1.ethers.constants.AddressZero,
             refundReceiver: hardhat_1.ethers.constants.AddressZero,
             nonce: nonce // Nonce of the Safe, transaction cannot be executed until Safe's nonce is not equal to this nonce
         };
         const ethAdapter = yield getEthAdapter();
-        const safeSdk = yield safe_core_sdk_1.default.create({ ethAdapter, safeAddress });
+        const safeSdk = yield protocol_kit_1.default.create({ ethAdapter, safeAddress });
         const safeTransaction = yield safeSdk.createTransaction({ safeTransactionData, options });
         yield estimateSafeTransaction(safeAddress, safeTransactionData);
         yield proposeTransaction(safeAddress, safeTransaction);
@@ -84,7 +106,7 @@ function proposeTransaction(safeAddress, safeTransaction) {
     return __awaiter(this, void 0, void 0, function* () {
         const [safeOwner] = yield hardhat_1.ethers.getSigners();
         const ethAdapter = yield getEthAdapter();
-        const safeSdk = yield safe_core_sdk_1.default.create({ ethAdapter, safeAddress });
+        const safeSdk = yield protocol_kit_1.default.create({ ethAdapter, safeAddress });
         const safeTxHash = yield safeSdk.getTransactionHash(safeTransaction);
         const senderSignature = yield safeSdk.signTransactionHash(safeTxHash);
         const safeService = yield getSafeService();
@@ -100,7 +122,7 @@ function proposeTransaction(safeAddress, safeTransaction) {
 function getEthAdapter() {
     return __awaiter(this, void 0, void 0, function* () {
         const [safeOwner] = yield hardhat_1.ethers.getSigners();
-        const ethAdapter = new safe_ethers_lib_1.default({
+        const ethAdapter = new protocol_kit_1.EthersAdapter({
             ethers: hardhat_1.ethers,
             signerOrProvider: safeOwner
         });
@@ -111,7 +133,7 @@ function getSafeService() {
     return __awaiter(this, void 0, void 0, function* () {
         const chainId = (yield hardhat_1.ethers.provider.getNetwork()).chainId;
         const ethAdapter = yield getEthAdapter();
-        const safeService = new safe_service_client_1.default({
+        const safeService = new api_kit_1.default({
             txServiceUrl: getSafeTransactionUrl(chainId),
             ethAdapter
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skalenetwork/upgrade-tools",
-  "version": "2.0.1-develop.2",
+  "version": "2.0.1-develop.4",
   "description": "Scripts to support upgrades of smart contracts",
   "files": [
     "dist/**/*"
@@ -40,10 +40,9 @@
   },
   "dependencies": {
     "@openzeppelin/contracts-upgradeable": "^4.4.2",
-    "@safe-global/safe-core-sdk": "^3.3.2",
-    "@safe-global/safe-core-sdk-types": "^1.9.0",
-    "@safe-global/safe-ethers-lib": "^1.9.2",
-    "@safe-global/safe-service-client": "^2.0.0",
+    "@safe-global/api-kit": "^1.3.0",
+    "@safe-global/protocol-kit": "^1.2.0",
+    "@safe-global/safe-core-sdk-types": "^2.2.0",
     "axios": "^1.4.0",
     "ethereumjs-util": "^7.1.4"
   },