@skalenetwork/upgrade-tools 3.0.0-linter.34 → 3.0.0-linter.36

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (60) hide show
  1. package/dist/hardhat.config.d.ts +1 -1
  2. package/dist/hardhat.config.js +2 -2
  3. package/dist/hardhat.config.js.map +1 -1
  4. package/dist/src/abi.d.ts +1 -1
  5. package/dist/src/abi.js +1 -1
  6. package/dist/src/abi.js.map +1 -1
  7. package/dist/src/contractFactory.d.ts +1 -1
  8. package/dist/src/deploy.d.ts +1 -1
  9. package/dist/src/deploy.js +2 -2
  10. package/dist/src/deploy.js.map +1 -1
  11. package/dist/src/gnosis-safe.d.ts +2 -2
  12. package/dist/src/gnosis-safe.js +35 -53
  13. package/dist/src/gnosis-safe.js.map +1 -1
  14. package/dist/src/index.d.ts +0 -1
  15. package/dist/src/index.js +0 -1
  16. package/dist/src/index.js.map +1 -1
  17. package/dist/src/nonceProvider.js +1 -1
  18. package/dist/src/nonceProvider.js.map +1 -1
  19. package/dist/src/submitters/auto-submitter.js +11 -13
  20. package/dist/src/submitters/auto-submitter.js.map +1 -1
  21. package/dist/src/submitters/eoa-submitter.d.ts +2 -2
  22. package/dist/src/submitters/eoa-submitter.js +1 -1
  23. package/dist/src/submitters/eoa-submitter.js.map +1 -1
  24. package/dist/src/submitters/safe-ima-legacy-marionette-submitter.d.ts +4 -3
  25. package/dist/src/submitters/safe-ima-legacy-marionette-submitter.js +6 -5
  26. package/dist/src/submitters/safe-ima-legacy-marionette-submitter.js.map +1 -1
  27. package/dist/src/submitters/safe-ima-marionette-submitter.d.ts +2 -2
  28. package/dist/src/submitters/safe-ima-marionette-submitter.js +10 -11
  29. package/dist/src/submitters/safe-ima-marionette-submitter.js.map +1 -1
  30. package/dist/src/submitters/safe-submitter.d.ts +4 -4
  31. package/dist/src/submitters/safe-submitter.js.map +1 -1
  32. package/dist/src/submitters/safe-to-ima-submitter.d.ts +4 -4
  33. package/dist/src/submitters/safe-to-ima-submitter.js +4 -2
  34. package/dist/src/submitters/safe-to-ima-submitter.js.map +1 -1
  35. package/dist/src/submitters/submitter.d.ts +2 -2
  36. package/dist/src/submitters/types/marionette.d.ts +5 -1
  37. package/dist/src/upgrader.d.ts +5 -3
  38. package/dist/src/upgrader.js +27 -62
  39. package/dist/src/upgrader.js.map +1 -1
  40. package/dist/src/verification.js +1 -1
  41. package/dist/src/verification.js.map +1 -1
  42. package/dist/typechain-types/AdminUpgradeabilityProxy.d.ts +59 -54
  43. package/dist/typechain-types/ProxyAdmin.d.ts +94 -137
  44. package/dist/typechain-types/common.d.ts +40 -11
  45. package/dist/typechain-types/factories/AdminUpgradeabilityProxy__factory.d.ts +71 -41
  46. package/dist/typechain-types/factories/AdminUpgradeabilityProxy__factory.js +7 -11
  47. package/dist/typechain-types/factories/AdminUpgradeabilityProxy__factory.js.map +1 -1
  48. package/dist/typechain-types/factories/ProxyAdmin__factory.d.ts +129 -41
  49. package/dist/typechain-types/factories/ProxyAdmin__factory.js +7 -11
  50. package/dist/typechain-types/factories/ProxyAdmin__factory.js.map +1 -1
  51. package/dist/typechain-types/factories/index.d.ts +2 -0
  52. package/dist/typechain-types/factories/index.js +11 -0
  53. package/dist/typechain-types/factories/index.js.map +1 -0
  54. package/dist/typechain-types/index.d.ts +1 -0
  55. package/dist/typechain-types/index.js +25 -1
  56. package/dist/typechain-types/index.js.map +1 -1
  57. package/package.json +13 -13
  58. package/dist/src/multiSend.d.ts +0 -10
  59. package/dist/src/multiSend.js +0 -26
  60. package/dist/src/multiSend.js.map +0 -1
@@ -1,5 +1,5 @@
1
1
  import "@typechain/hardhat";
2
- import "@nomiclabs/hardhat-ethers";
2
+ import "@nomicfoundation/hardhat-ethers";
3
3
  import "@openzeppelin/hardhat-upgrades";
4
4
  import { HardhatUserConfig } from "hardhat/config";
5
5
  declare const config: HardhatUserConfig;
@@ -1,13 +1,13 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  require("@typechain/hardhat");
4
- require("@nomiclabs/hardhat-ethers");
4
+ require("@nomicfoundation/hardhat-ethers");
5
5
  require("@openzeppelin/hardhat-upgrades");
6
6
  const coreArtifacts = "node_modules/@openzeppelin/upgrades-core/artifacts/[!b]*.json";
7
7
  const config = {
8
8
  "typechain": {
9
9
  "externalArtifacts": [coreArtifacts],
10
- "target": "ethers-v5"
10
+ "target": "ethers-v6"
11
11
  }
12
12
  };
13
13
  exports.default = config;
@@ -1 +1 @@
1
- {"version":3,"file":"hardhat.config.js","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":";;AAAA,8BAA4B;AAC5B,qCAAmC;AACnC,0CAAwC;AAIxC,MAAM,aAAa,GACf,+DAA+D,CAAC;AAEpE,MAAM,MAAM,GAAsB;IAC9B,WAAW,EAAE;QACT,mBAAmB,EAAE,CAAC,aAAa,CAAC;QACpC,QAAQ,EAAE,WAAW;KACxB;CACJ,CAAC;AAEF,kBAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"hardhat.config.js","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":";;AAAA,8BAA4B;AAC5B,2CAAyC;AACzC,0CAAwC;AAIxC,MAAM,aAAa,GACf,+DAA+D,CAAC;AAEpE,MAAM,MAAM,GAAsB;IAC9B,WAAW,EAAE;QACT,mBAAmB,EAAE,CAAC,aAAa,CAAC;QACpC,QAAQ,EAAE,WAAW;KACxB;CACJ,CAAC;AAEF,kBAAe,MAAM,CAAC"}
package/dist/src/abi.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- import { Interface } from "ethers/lib/utils";
1
+ import { Interface } from "ethers";
2
2
  export declare const getAbi: (contractInterface: Interface) => [];
package/dist/src/abi.js CHANGED
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getAbi = void 0;
4
4
  const getAbi = (contractInterface) => {
5
- const abi = JSON.parse(contractInterface.format("json"));
5
+ const abi = JSON.parse(contractInterface.formatJson());
6
6
  abi.forEach((obj) => {
7
7
  if (obj.type === "function") {
8
8
  const func = obj;
@@ -1 +1 @@
1
- {"version":3,"file":"abi.js","sourceRoot":"","sources":["../../src/abi.ts"],"names":[],"mappings":";;;AAEO,MAAM,MAAM,GAAG,CAAC,iBAA4B,EAAE,EAAE;IACnD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAW,CAAO,CAAC;IAEzE,GAAG,CAAC,OAAO,CAAC,CAAC,GAAmB,EAAE,EAAE;QAChC,IAAI,GAAG,CAAC,IAAI,KAAK,UAAU,EAAE;YACzB,MAAM,IAAI,GAAG,GAKZ,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,MAAc,EAAE,EAAE;gBACxD,MAAM,CAAC,MAAM,CACT,MAAM,EACN;oBACI,MAAM,EAAE,EAAE;oBACV,GAAG,MAAM;iBACZ,CACJ,CAAC;YACN,CAAC,CAAC,CAAC;SACN;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACf,CAAC,CAAC;AAxBW,QAAA,MAAM,UAwBjB"}
1
+ {"version":3,"file":"abi.js","sourceRoot":"","sources":["../../src/abi.ts"],"names":[],"mappings":";;;AAEO,MAAM,MAAM,GAAG,CAAC,iBAA4B,EAAE,EAAE;IACnD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAO,CAAC;IAE7D,GAAG,CAAC,OAAO,CAAC,CAAC,GAAmB,EAAE,EAAE;QAChC,IAAI,GAAG,CAAC,IAAI,KAAK,UAAU,EAAE;YACzB,MAAM,IAAI,GAAG,GAKZ,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,MAAc,EAAE,EAAE;gBACxD,MAAM,CAAC,MAAM,CACT,MAAM,EACN;oBACI,MAAM,EAAE,EAAE;oBACV,GAAG,MAAM;iBACZ,CACJ,CAAC;YACN,CAAC,CAAC,CAAC;SACN;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACf,CAAC,CAAC;AAxBW,QAAA,MAAM,UAwBjB"}
@@ -1,4 +1,4 @@
1
1
  import { LinkReferences } from "hardhat/types";
2
2
  import { NonceProvider } from "./nonceProvider";
3
3
  export declare const getLibrariesNames: (linkReferences: LinkReferences) => string[];
4
- export declare const getContractFactoryAndUpdateManifest: (contract: string, nonceProvider?: NonceProvider) => Promise<import("ethers").ContractFactory>;
4
+ export declare const getContractFactoryAndUpdateManifest: (contract: string, nonceProvider?: NonceProvider) => Promise<import("ethers").ContractFactory<any[], import("ethers").BaseContract>>;
@@ -1,4 +1,4 @@
1
1
  import { NonceProvider } from "./nonceProvider";
2
2
  export declare const deployLibraries: (libraryNames: string[], nonceProvider?: NonceProvider) => Promise<Map<string, string>>;
3
3
  export declare const getManifestFile: () => Promise<string>;
4
- export declare const getContractFactory: (contract: string) => Promise<import("ethers").ContractFactory>;
4
+ export declare const getContractFactory: (contract: string) => Promise<import("ethers").ContractFactory<any[], import("ethers").BaseContract>>;
@@ -10,8 +10,8 @@ const deployLibrary = async (libraryName, nonceProvider) => {
10
10
  const Library = await hardhat_1.ethers.getContractFactory(libraryName);
11
11
  const library = await Library.
12
12
  deploy({ "nonce": nonceProvider.reserveNonce() });
13
- await library.deployed();
14
- return library.address;
13
+ await library.waitForDeployment();
14
+ return await library.getAddress();
15
15
  };
16
16
  const deployLibraries = async (libraryNames, nonceProvider) => {
17
17
  const [deployer] = await hardhat_1.ethers.getSigners();
@@ -1 +1 @@
1
- {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/deploy.ts"],"names":[],"mappings":";;;AAAA,+DAAmE;AACnE,qCAA0C;AAC1C,mDAA8C;AAE9C,2BAAkC;AAClC,uDAAoD;AAOpD,MAAM,aAAa,GAAG,KAAK,EACvB,WAAmB,EACnB,aAA4B,EAC9B,EAAE;IACA,MAAM,OAAO,GAAG,MAAM,gBAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,MAAM,OAAO;QACzB,MAAM,CAAC,EAAC,OAAO,EAAE,aAAa,CAAC,YAAY,EAAE,EAAC,CAAC,CAAC;IACpD,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC;IACzB,OAAO,OAAO,CAAC,OAAO,CAAC;AAC3B,CAAC,CAAC;AAEK,MAAM,eAAe,GAAG,KAAK,EAChC,YAAsB,EACtB,aAA6B,EAC/B,EAAE;IACA,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,gBAAM,CAAC,UAAU,EAAE,CAAC;IAC7C,MAAM,wBAAwB,GAAG,aAAa;QACzC,MAAM,6BAAa,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IACnD,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;IAE5C,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAC9D,WAAW;QACX,MAAM,aAAa,CACf,WAAW,EACX,wBAAwB,CAC3B;KACJ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CACb,WAAW,EACX,cAAc,CACjB,EAAE,EAAE;QACD,SAAS,CAAC,GAAG,CACT,WAAW,EACX,cAAc,CACjB,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACrB,CAAC,CAAC;AA1BW,QAAA,eAAe,mBA0B1B;AAEK,MAAM,eAAe,GAAG,KAAK,UAAU,eAAe;IACzD,OAAO,CAAC,MAAM,wBAAQ,CAAC,UAAU,CAAC,gBAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7D,CAAC,CAAC;AAFW,QAAA,eAAe,mBAE1B;AAEF,MAAM,cAAc,GAAG,KAAK,EAAE,gBAAkC,EAAE,EAAE;IAChE,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,aAAE,CAAC,QAAQ,CACzC,MAAM,IAAA,uBAAe,GAAE,EACvB,OAAO,CACV,CAAsB,CAAC;IACxB,IAAI,OAAO,QAAQ,CAAC,SAAS,KAAK,WAAW,EAAE;QAC3C,MAAM,CAAC,MAAM,CACT,QAAQ,EACR,EAAC,WAAW,EAAE,gBAAgB,EAAC,CAClC,CAAC;KACL;SAAM;QACH,MAAM,CAAC,MAAM,CACT,gBAAgB,EAChB,QAAQ,CAAC,SAAS,CACrB,CAAC;KACL;IACD,MAAM,WAAW,GAAG,CAAC,CAAC;IACtB,MAAM,aAAE,CAAC,SAAS,CACd,MAAM,IAAA,uBAAe,GAAE,EACvB,IAAI,CAAC,SAAS,CACV,QAAQ,EACR,IAAI,EACJ,WAAW,CACd,CACJ,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,KAAK,EAAE,SAA8B,EAAE,EAAE;IACjE,MAAM,gBAAgB,GAAqB,EAAE,CAAC;IAE9C,MAAM,kBAAkB,GAAG,KAAK,EAC5B,WAAmB,EACnB,cAAsB,EACxB,EAAE;QACA,MAAM,EAAC,QAAQ,EAAC,GAAG,MAAM,mBAAS,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAC7D,OAAO;YACH,SAAS,EAAE,cAAc;YACzB,cAAc,EAAE,IAAA,4BAAY,EAAC,QAAQ,CAAC;YACtC,WAAW;SACd,CAAC;IACN,CAAC,CAAC;IAEF,KAAK,MAAM,eAAe,IAAI,MAAM,OAAO;QACvC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CACrC,WAAW,EACX,cAAc,CACjB,EAAE,EAAE,CAAC,kBAAkB,CACpB,WAAW,EACX,cAAc,CACjB,CAAC,CAAC,EAAE;QACL,gBAAgB,CAAC,eAAe,CAAC,WAAW,CAAC,GAAG;YAC5C,SAAS,EAAE,eAAe,CAAC,OAAO;YAClC,cAAc,EAAE,eAAe,CAAC,YAAY;SAC/C,CAAC;KACL;IAED,OAAO,gBAAgB,CAAC;AAC5B,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,KAAK,EAAE,QAAgB,EAAE,EAAE;IACzD,MAAM,EAAC,cAAc,EAAC,GAAG,MAAM,mBAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAChE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,EAAE;QACrC,OAAO,MAAM,gBAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;KACpD;IAED,MAAM,YAAY,GAAG,IAAA,mCAAiB,EAAC,cAAc,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,MAAM,IAAA,uBAAe,EAAC,YAAY,CAAC,CAAC;IACtD,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAE9D,MAAM,cAAc,CAAC,gBAAgB,CAAC,CAAC;IAEvC,OAAO,MAAM,gBAAM,CAAC,kBAAkB,CAClC,QAAQ,EACR,EAAC,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAC,CAC/C,CAAC;AACN,CAAC,CAAC;AAhBW,QAAA,kBAAkB,sBAgB7B"}
1
+ {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/deploy.ts"],"names":[],"mappings":"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"}
@@ -1,2 +1,2 @@
1
- import { UnsignedTransaction } from "ethers";
2
- export declare const createMultiSendTransaction: (safeAddress: string, transactions: UnsignedTransaction[]) => Promise<void>;
1
+ import { Transaction } from "ethers";
2
+ export declare const createMultiSendTransaction: (safeAddress: string, transactions: Transaction[]) => Promise<void>;
@@ -1,43 +1,37 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
26
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
4
  };
28
5
  Object.defineProperty(exports, "__esModule", { value: true });
29
6
  exports.createMultiSendTransaction = void 0;
30
7
  const safe_core_sdk_types_1 = require("@safe-global/safe-core-sdk-types");
31
- const protocol_kit_1 = __importStar(require("@safe-global/protocol-kit"));
8
+ const ethers_1 = require("ethers");
9
+ const hardhat_1 = require("hardhat");
10
+ const protocol_kit_1 = __importDefault(require("@safe-global/protocol-kit"));
32
11
  const api_kit_1 = __importDefault(require("@safe-global/api-kit"));
33
12
  const chalk_1 = __importDefault(require("chalk"));
34
- const hardhat_1 = require("hardhat");
35
- const networks_1 = require("@ethersproject/networks");
13
+ // Cspell:words arbitrum celo sepolia xdai
36
14
  // Constants
37
15
  const URLS = {
38
16
  "safe_transaction": {
39
- [(0, networks_1.getNetwork)("mainnet").chainId]: "https://safe-transaction-mainnet.safe.global",
40
- [(0, networks_1.getNetwork)("goerli").chainId]: "https://safe-transaction-goerli.safe.global"
17
+ [ethers_1.Network.from("mainnet").chainId.toString()]: "https://safe-transaction-mainnet.safe.global",
18
+ [ethers_1.Network.from("arbitrum").chainId.toString()]: "https://safe-transaction-arbitrum.safe.global",
19
+ [ethers_1.Network.from("aurora").chainId.toString()]: "https://safe-transaction-aurora.safe.global",
20
+ [ethers_1.Network.from("avalanche").chainId.toString()]: "https://safe-transaction-avalanche.safe.global",
21
+ [ethers_1.Network.from("base").chainId.toString()]: "https://safe-transaction-base.safe.global",
22
+ [ethers_1.Network.from("base-sepolia").chainId.toString()]: "https://safe-transaction-base-sepolia.safe.global",
23
+ [ethers_1.Network.from("bnb").chainId.toString()]: "https://safe-transaction-bsc.safe.global",
24
+ [ethers_1.Network.from("celo").chainId.toString()]: "https://safe-transaction-celo.safe.global",
25
+ [ethers_1.Network.from("xdai").chainId.toString()]: "https://safe-transaction-gnosis-chain.safe.global",
26
+ [ethers_1.Network.from("optimism").chainId.toString()]: "https://safe-transaction-optimism.safe.global",
27
+ [ethers_1.Network.from("matic").chainId.toString()]: "https://safe-transaction-polygon.safe.global",
28
+ // Polygon zkEVM
29
+ "1101": "https://safe-transaction-zkevm.safe.global",
30
+ // ZkSync Era Mainnet
31
+ "324": "https://safe-transaction-zksync.safe.global",
32
+ // Scroll
33
+ "534352": "https://safe-transaction-scroll.safe.global",
34
+ [ethers_1.Network.from("sepolia").chainId.toString()]: "https://safe-transaction-sepolia.safe.global",
41
35
  }
42
36
  };
43
37
  const defaultOptions = {
@@ -53,9 +47,9 @@ const defaultOptions = {
53
47
  * to be used as a refund to the sender,
54
48
  * if `null` is Ether
55
49
  */
56
- "gasToken": hardhat_1.ethers.constants.AddressZero,
50
+ "gasToken": hardhat_1.ethers.ZeroAddress,
57
51
  // Address of receiver of gas payment (or `null` if tx.origin)
58
- "refundReceiver": hardhat_1.ethers.constants.AddressZero,
52
+ "refundReceiver": hardhat_1.ethers.ZeroAddress,
59
53
  // Max gas to use in the transaction
60
54
  "safeTxGas": "0"
61
55
  };
@@ -64,34 +58,25 @@ const getSafeTransactionData = (transactions) => {
64
58
  const safeTransactionData = [];
65
59
  for (const transaction of transactions) {
66
60
  safeTransactionData.push({
67
- "data": transaction.data?.toString() ?? "0x",
61
+ "data": transaction.data,
68
62
  "operation": safe_core_sdk_types_1.OperationType.Call,
69
- "to": transaction.to ?? hardhat_1.ethers.constants.AddressZero,
70
- "value": transaction.value?.toString() ?? "0"
63
+ "to": transaction.to ?? hardhat_1.ethers.ZeroAddress,
64
+ "value": transaction.value.toString()
71
65
  });
72
66
  }
73
67
  return safeTransactionData;
74
68
  };
75
- const getEthAdapter = async () => {
76
- const [safeOwner] = await hardhat_1.ethers.getSigners();
77
- const ethAdapter = new protocol_kit_1.EthersAdapter({
78
- ethers: hardhat_1.ethers,
79
- "signerOrProvider": safeOwner
80
- });
81
- return ethAdapter;
82
- };
83
69
  const getSafeTransactionUrl = (chainId) => {
84
70
  if (Object.keys(URLS.safe_transaction).includes(chainId.toString())) {
85
- return URLS.safe_transaction[chainId];
71
+ return URLS.safe_transaction[Number(chainId)];
86
72
  }
87
- throw Error("Can't get safe-transaction url" +
73
+ throw Error("Can't get Safe Transaction Service url" +
88
74
  ` at network with chainId = ${chainId}`);
89
75
  };
90
76
  const getSafeService = async () => {
91
77
  const { chainId } = await hardhat_1.ethers.provider.getNetwork();
92
- const ethAdapter = await getEthAdapter();
93
78
  const safeService = new api_kit_1.default({
94
- ethAdapter,
79
+ chainId,
95
80
  "txServiceUrl": getSafeTransactionUrl(chainId)
96
81
  });
97
82
  return safeService;
@@ -115,11 +100,9 @@ const estimateSafeTransaction = async (safeAddress, safeTransactionData) => {
115
100
  };
116
101
  const proposeTransaction = async (safeAddress, safeTransaction) => {
117
102
  const [safeOwner] = await hardhat_1.ethers.getSigners();
118
- const ethAdapter = await getEthAdapter();
119
- const safeSdk = await protocol_kit_1.default.create({ ethAdapter,
120
- safeAddress });
103
+ const safeSdk = await protocol_kit_1.default.init({ provider: hardhat_1.network.provider, safeAddress });
121
104
  const safeTxHash = await safeSdk.getTransactionHash(safeTransaction);
122
- const senderSignature = await safeSdk.signTransactionHash(safeTxHash);
105
+ const senderSignature = await safeSdk.signHash(safeTxHash);
123
106
  const safeService = await getSafeService();
124
107
  await safeService.proposeTransaction({
125
108
  safeAddress,
@@ -146,14 +129,13 @@ const createMultiSendTransaction = async (safeAddress, transactions) => {
146
129
  nonce
147
130
  }
148
131
  };
149
- const ethAdapter = await getEthAdapter();
150
- const safeSdk = await protocol_kit_1.default.create({
151
- ethAdapter,
132
+ const safeSdk = await protocol_kit_1.default.init({
133
+ provider: hardhat_1.network.provider,
152
134
  safeAddress
153
135
  });
154
136
  const safeTransaction = await safeSdk.createTransaction({
155
137
  options,
156
- safeTransactionData
138
+ transactions: safeTransactionData
157
139
  });
158
140
  await estimateSafeTransaction(safeAddress, safeTransactionData);
159
141
  await proposeTransaction(safeAddress, safeTransaction);
@@ -1 +1 @@
1
- {"version":3,"file":"gnosis-safe.js","sourceRoot":"","sources":["../../src/gnosis-safe.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"gnosis-safe.js","sourceRoot":"","sources":["../../src/gnosis-safe.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,6 @@
1
1
  export * from "./abi";
2
2
  export * from "./deploy";
3
3
  export * from "./gnosis-safe";
4
- export * from "./multiSend";
5
4
  export * from "./submitters";
6
5
  export * from "./verification";
7
6
  export * from "./version";
package/dist/src/index.js CHANGED
@@ -17,7 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
17
17
  __exportStar(require("./abi"), exports);
18
18
  __exportStar(require("./deploy"), exports);
19
19
  __exportStar(require("./gnosis-safe"), exports);
20
- __exportStar(require("./multiSend"), exports);
21
20
  __exportStar(require("./submitters"), exports);
22
21
  __exportStar(require("./verification"), exports);
23
22
  __exportStar(require("./version"), exports);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,2CAAyB;AACzB,gDAA8B;AAC9B,8CAA4B;AAC5B,+CAA6B;AAC7B,iDAA+B;AAC/B,4CAA0B;AAC1B,6CAA2B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,2CAAyB;AACzB,gDAA8B;AAC9B,+CAA6B;AAC7B,iDAA+B;AAC/B,4CAA0B;AAC1B,6CAA2B"}
@@ -6,7 +6,7 @@ class NonceProvider {
6
6
  this.currentNonce = nonce;
7
7
  }
8
8
  static async createForWallet(signer) {
9
- return new NonceProvider(await signer.getTransactionCount());
9
+ return new NonceProvider(await signer.getNonce());
10
10
  }
11
11
  reserveNonce() {
12
12
  const nonce = this.currentNonce;
@@ -1 +1 @@
1
- {"version":3,"file":"nonceProvider.js","sourceRoot":"","sources":["../../src/nonceProvider.ts"],"names":[],"mappings":";;;AAEA,MAAa,aAAa;IAGtB,YAAa,KAAa;QACtB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,eAAe,CAAE,MAAc;QACxC,OAAO,IAAI,aAAa,CAAC,MAAM,MAAM,CAAC,mBAAmB,EAAE,CAAC,CAAC;IACjE,CAAC;IAED,YAAY;QACR,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC;QAChC,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC;QACvB,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AAhBD,sCAgBC"}
1
+ {"version":3,"file":"nonceProvider.js","sourceRoot":"","sources":["../../src/nonceProvider.ts"],"names":[],"mappings":";;;AAEA,MAAa,aAAa;IAGtB,YAAa,KAAa;QACtB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,eAAe,CAAE,MAAc;QACxC,OAAO,IAAI,aAAa,CAAC,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IACtD,CAAC;IAED,YAAY;QACR,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC;QAChC,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC;QACvB,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AAhBD,sCAgBC"}
@@ -34,9 +34,9 @@ const marionette_1 = require("./types/marionette");
34
34
  const safe_ima_legacy_marionette_submitter_1 = require("./safe-ima-legacy-marionette-submitter");
35
35
  const safe_submitter_1 = require("./safe-submitter");
36
36
  const submitter_1 = require("./submitter");
37
+ const upgrader_1 = require("../upgrader");
37
38
  const chalk_1 = __importDefault(require("chalk"));
38
- const admin_1 = require("@openzeppelin/hardhat-upgrades/dist/admin");
39
- const skale_contracts_ethers_v5_1 = require("@skalenetwork/skale-contracts-ethers-v5");
39
+ const skale_contracts_ethers_v6_1 = require("@skalenetwork/skale-contracts-ethers-v6");
40
40
  class AutoSubmitter extends submitter_1.Submitter {
41
41
  constructor() {
42
42
  super(...arguments);
@@ -49,8 +49,7 @@ class AutoSubmitter extends submitter_1.Submitter {
49
49
  }
50
50
  // Private
51
51
  static async getSubmitter() {
52
- // TODO: remove unknown when move everything to ethers 6
53
- const proxyAdmin = await (0, admin_1.getManifestAdmin)(hardhat_1.default);
52
+ const proxyAdmin = await upgrader_1.Upgrader.getProxyAdmin();
54
53
  const owner = await proxyAdmin.owner();
55
54
  if (await hardhat_1.default.ethers.provider.getCode(owner) === "0x") {
56
55
  console.log("Owner is not a contract");
@@ -60,8 +59,8 @@ class AutoSubmitter extends submitter_1.Submitter {
60
59
  return AutoSubmitter.getSubmitterForContractOwner(owner);
61
60
  }
62
61
  static async getSubmitterForContractOwner(owner) {
63
- if (hardhat_1.ethers.utils.getAddress(owner) ===
64
- hardhat_1.ethers.utils.getAddress(marionette_1.MARIONETTE_ADDRESS)) {
62
+ if (hardhat_1.ethers.getAddress(owner) ===
63
+ hardhat_1.ethers.getAddress(marionette_1.MARIONETTE_ADDRESS)) {
65
64
  console.log("Marionette owner is detected");
66
65
  const imaInstance = await AutoSubmitter.getImaInstance();
67
66
  const mainnetChainId = AutoSubmitter.getMainnetChainId();
@@ -107,8 +106,8 @@ class AutoSubmitter extends submitter_1.Submitter {
107
106
  " to IMA environment variable"));
108
107
  process.exit(exitCodes_1.EXIT_CODES.UNKNOWN_IMA);
109
108
  }
110
- const network = await skale_contracts_ethers_v5_1.skaleContracts.getNetworkByProvider(hardhat_1.ethers.provider);
111
- const ima = await network.getProject("ima");
109
+ const contractsNetwork = await skale_contracts_ethers_v6_1.skaleContracts.getNetworkByProvider(hardhat_1.ethers.provider);
110
+ const ima = await contractsNetwork.getProject("ima");
112
111
  return await ima.getInstance(process.env.IMA);
113
112
  }
114
113
  static getSafeAddress() {
@@ -125,7 +124,7 @@ class AutoSubmitter extends submitter_1.Submitter {
125
124
  return process.env.SCHAIN_HASH;
126
125
  }
127
126
  if (process.env.SCHAIN_NAME) {
128
- return hardhat_1.ethers.utils.solidityKeccak256(["string"], [process.env.SCHAIN_NAME]);
127
+ return hardhat_1.ethers.solidityPackedKeccak256(["string"], [process.env.SCHAIN_NAME]);
129
128
  }
130
129
  console.log(chalk_1.default.red("Set schain name" +
131
130
  " to SCHAIN_NAME environment variable"));
@@ -134,9 +133,8 @@ class AutoSubmitter extends submitter_1.Submitter {
134
133
  throw Error("Schain is not set");
135
134
  }
136
135
  static getMainnetChainId() {
137
- const CHAIN_ID_RADIX = 10;
138
136
  if (process.env.MAINNET_CHAIN_ID) {
139
- return Number.parseInt(process.env.MAINNET_CHAIN_ID, CHAIN_ID_RADIX);
137
+ return BigInt(process.env.MAINNET_CHAIN_ID);
140
138
  }
141
139
  console.log(chalk_1.default.red("Set chainId of mainnet" +
142
140
  " to MAINNET_CHAIN_ID environment variable"));
@@ -152,7 +150,7 @@ class AutoSubmitter extends submitter_1.Submitter {
152
150
  * If the bytecode doesn't include the function selector version()
153
151
  * is definitely not present
154
152
  */
155
- if (!bytecode.includes(hardhat_1.ethers.utils.id("version()").slice(hexPrefixLength, selectorLength))) {
153
+ if (!bytecode.includes(hardhat_1.ethers.id("version()").slice(hexPrefixLength, selectorLength))) {
156
154
  return false;
157
155
  }
158
156
  const marionette = new hardhat_1.ethers.Contract(marionette_1.MARIONETTE_ADDRESS, AutoSubmitter.marionetteInterface, hardhat_1.default.ethers.provider);
@@ -161,7 +159,7 @@ class AutoSubmitter extends submitter_1.Submitter {
161
159
  * given the provided function selector
162
160
  */
163
161
  try {
164
- await marionette.estimateGas.version();
162
+ await marionette.version.estimateGas();
165
163
  return true;
166
164
  }
167
165
  catch {
@@ -1 +1 @@
1
- {"version":3,"file":"auto-submitter.js","sourceRoot":"","sources":["../../../src/submitters/auto-submitter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auto-submitter.js","sourceRoot":"","sources":["../../../src/submitters/auto-submitter.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import { Submitter } from "./submitter";
2
- import { UnsignedTransaction } from "ethers";
2
+ import { Transaction } from "ethers";
3
3
  export declare class EoaSubmitter extends Submitter {
4
4
  name: string;
5
- submit(transactions: UnsignedTransaction[]): Promise<void>;
5
+ submit(transactions: Transaction[]): Promise<void>;
6
6
  }
@@ -11,7 +11,7 @@ class EoaSubmitter extends submitter_1.Submitter {
11
11
  async submit(transactions) {
12
12
  EoaSubmitter.atomicityWarning();
13
13
  const [deployer] = await hardhat_1.ethers.getSigners();
14
- const nonce = await deployer.getTransactionCount();
14
+ const nonce = await deployer.getNonce();
15
15
  console.log(`Send transaction via ${this.name}`);
16
16
  const responses = await Promise.all(transactions.
17
17
  map((transaction, index) => deployer.sendTransaction({
@@ -1 +1 @@
1
- {"version":3,"file":"eoa-submitter.js","sourceRoot":"","sources":["../../../src/submitters/eoa-submitter.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AAEtC,qCAA+B;AAG/B,MAAa,YAAa,SAAQ,qBAAS;IAA3C;;QACI,SAAI,GAAG,eAAe,CAAC;IAoB3B,CAAC;IAlBG,KAAK,CAAC,MAAM,CAAE,YAAmC;QAC7C,YAAY,CAAC,gBAAgB,EAAE,CAAC;QAChC,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,gBAAM,CAAC,UAAU,EAAE,CAAC;QAC7C,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,mBAAmB,EAAE,CAAC;QACnD,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACjD,MAAM,SAAS,GACX,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY;YAC1B,GAAG,CAAC,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC;YACjD,MAAM,EAAE,WAAW,CAAC,IAAI;YACxB,OAAO,EAAE,KAAK,GAAG,KAAK;YACtB,IAAI,EAAE,WAAW,CAAC,EAAE;YACpB,OAAO,EAAE,WAAW,CAAC,KAAK;SAC7B,CAAC,CAAC,CAAC,CAAC;QAEb,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;QACxC,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAChE,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;IAC9C,CAAC;CACJ;AArBD,oCAqBC"}
1
+ {"version":3,"file":"eoa-submitter.js","sourceRoot":"","sources":["../../../src/submitters/eoa-submitter.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AAEtC,qCAA+B;AAG/B,MAAa,YAAa,SAAQ,qBAAS;IAA3C;;QACI,SAAI,GAAG,eAAe,CAAC;IAoB3B,CAAC;IAlBG,KAAK,CAAC,MAAM,CAAE,YAA2B;QACrC,YAAY,CAAC,gBAAgB,EAAE,CAAC;QAChC,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,gBAAM,CAAC,UAAU,EAAE,CAAC;QAC7C,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACjD,MAAM,SAAS,GACX,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY;YAC1B,GAAG,CAAC,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC;YACjD,MAAM,EAAE,WAAW,CAAC,IAAI;YACxB,OAAO,EAAE,KAAK,GAAG,KAAK;YACtB,IAAI,EAAE,WAAW,CAAC,EAAE;YACpB,OAAO,EAAE,WAAW,CAAC,KAAK;SAC7B,CAAC,CAAC,CAAC,CAAC;QAEb,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;QACxC,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAChE,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;IAC9C,CAAC;CACJ;AArBD,oCAqBC"}
@@ -1,6 +1,7 @@
1
- import { UnsignedTransaction } from "ethers";
1
+ import { LegacyMarionette } from "./types/marionette";
2
2
  import { SafeToImaSubmitter } from "./safe-to-ima-submitter";
3
+ import { Transaction } from "ethers";
3
4
  export declare class SafeImaLegacyMarionetteSubmitter extends SafeToImaSubmitter {
4
- marionette: import("ethers").Contract;
5
- submit(transactions: UnsignedTransaction[]): Promise<void>;
5
+ marionette: LegacyMarionette;
6
+ submit(transactions: Transaction[]): Promise<void>;
6
7
  }
@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.SafeImaLegacyMarionetteSubmitter = void 0;
4
4
  const marionette_1 = require("./types/marionette");
5
5
  const safe_to_ima_submitter_1 = require("./safe-to-ima-submitter");
6
+ const ethers_1 = require("ethers");
6
7
  const hardhat_1 = require("hardhat");
7
8
  class SafeImaLegacyMarionetteSubmitter extends safe_to_ima_submitter_1.SafeToImaSubmitter {
8
9
  constructor() {
9
10
  super(...arguments);
10
- this.marionette = new hardhat_1.ethers.Contract(marionette_1.MARIONETTE_ADDRESS, new hardhat_1.ethers.utils.Interface([
11
+ this.marionette = new hardhat_1.ethers.BaseContract(marionette_1.MARIONETTE_ADDRESS, new hardhat_1.ethers.Interface([
11
12
  {
12
13
  "inputs": [
13
14
  {
@@ -44,11 +45,11 @@ class SafeImaLegacyMarionetteSubmitter extends safe_to_ima_submitter_1.SafeToIma
44
45
  if (transactions.length > singleTransaction) {
45
46
  SafeImaLegacyMarionetteSubmitter.atomicityWarning();
46
47
  }
47
- const zeroValue = 0;
48
+ const marionetteAddress = await this.marionette.getAddress();
48
49
  const transactionsToMarionette = (await Promise.all(transactions.
49
- map((transaction) => this.marionette.encodeFunctionCall(transaction.to ?? hardhat_1.ethers.constants.AddressZero, transaction.value ?? zeroValue, transaction.data ?? "0x")))).map((data) => ({
50
- data,
51
- "to": this.marionette.address
50
+ map((transaction) => this.marionette.encodeFunctionCall(transaction.to ?? hardhat_1.ethers.ZeroAddress, transaction.value, transaction.data)))).map((data) => ethers_1.Transaction.from({
51
+ "data": hardhat_1.ethers.hexlify(data),
52
+ "to": marionetteAddress
52
53
  }));
53
54
  await super.submit(transactionsToMarionette);
54
55
  }
@@ -1 +1 @@
1
- {"version":3,"file":"safe-ima-legacy-marionette-submitter.js","sourceRoot":"","sources":["../../../src/submitters/safe-ima-legacy-marionette-submitter.ts"],"names":[],"mappings":";;;AACA,mDAAsD;AACtD,mEAA2D;AAC3D,qCAA+B;AAG/B,MAAa,gCAAiC,SAAQ,0CAAkB;IAAxE;;QACI,eAAU,GAAG,IAAI,gBAAM,CAAC,QAAQ,CAC5B,+BAAkB,EAClB,IAAI,gBAAM,CAAC,KAAK,CAAC,SAAS,CAAC;YACvB;gBACI,QAAQ,EAAE;oBACN;wBACI,cAAc,EAAE,SAAS;wBACzB,MAAM,EAAE,UAAU;wBAClB,MAAM,EAAE,SAAS;qBACpB;oBACD;wBACI,cAAc,EAAE,SAAS;wBACzB,MAAM,EAAE,OAAO;wBACf,MAAM,EAAE,SAAS;qBACpB;oBACD;wBACI,cAAc,EAAE,OAAO;wBACvB,MAAM,EAAE,MAAM;wBACd,MAAM,EAAE,OAAO;qBAClB;iBACJ;gBACD,MAAM,EAAE,oBAAoB;gBAC5B,SAAS,EAAE;oBACP;wBACI,cAAc,EAAE,OAAO;wBACvB,MAAM,EAAE,EAAE;wBACV,MAAM,EAAE,OAAO;qBAClB;iBACJ;gBACD,iBAAiB,EAAE,MAAM;gBACzB,MAAM,EAAE,UAAU;aACrB;SACJ,CAAC,EACF,gBAAM,CAAC,QAAQ,CAClB,CAAC;IAsBN,CAAC;IApBG,KAAK,CAAC,MAAM,CAAE,YAAmC;QAC7C,MAAM,iBAAiB,GAAG,CAAC,CAAC;QAC5B,IAAI,YAAY,CAAC,MAAM,GAAG,iBAAiB,EAAE;YACzC,gCAAgC,CAAC,gBAAgB,EAAE,CAAC;SACvD;QACD,MAAM,SAAS,GAAG,CAAC,CAAC;QACpB,MAAM,wBAAwB,GAC1B,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY;YAC3B,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CACnD,WAAW,CAAC,EAAE,IAAI,gBAAM,CAAC,SAAS,CAAC,WAAW,EAC9C,WAAW,CAAC,KAAK,IAAI,SAAS,EAC9B,WAAW,CAAC,IAAI,IAAI,IAAI,CACL,CAAC,CAAC,CAC5B,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACb,IAAI;YACJ,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO;SAChC,CAAC,CAAC,CAAC;QAER,MAAM,KAAK,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;IACjD,CAAC;CACJ;AAzDD,4EAyDC"}
1
+ {"version":3,"file":"safe-ima-legacy-marionette-submitter.js","sourceRoot":"","sources":["../../../src/submitters/safe-ima-legacy-marionette-submitter.ts"],"names":[],"mappings":";;;AAAA,mDAAwE;AACxE,mEAA2D;AAC3D,mCAAmC;AACnC,qCAA+B;AAG/B,MAAa,gCAAiC,SAAQ,0CAAkB;IAAxE;;QACI,eAAU,GAAG,IAAI,gBAAM,CAAC,YAAY,CAChC,+BAAkB,EAClB,IAAI,gBAAM,CAAC,SAAS,CAAC;YACjB;gBACI,QAAQ,EAAE;oBACN;wBACI,cAAc,EAAE,SAAS;wBACzB,MAAM,EAAE,UAAU;wBAClB,MAAM,EAAE,SAAS;qBACpB;oBACD;wBACI,cAAc,EAAE,SAAS;wBACzB,MAAM,EAAE,OAAO;wBACf,MAAM,EAAE,SAAS;qBACpB;oBACD;wBACI,cAAc,EAAE,OAAO;wBACvB,MAAM,EAAE,MAAM;wBACd,MAAM,EAAE,OAAO;qBAClB;iBACJ;gBACD,MAAM,EAAE,oBAAoB;gBAC5B,SAAS,EAAE;oBACP;wBACI,cAAc,EAAE,OAAO;wBACvB,MAAM,EAAE,EAAE;wBACV,MAAM,EAAE,OAAO;qBAClB;iBACJ;gBACD,iBAAiB,EAAE,MAAM;gBACzB,MAAM,EAAE,UAAU;aACrB;SACJ,CAAC,EACF,gBAAM,CAAC,QAAQ,CACE,CAAC;IAsB1B,CAAC;IApBG,KAAK,CAAC,MAAM,CAAE,YAA2B;QACrC,MAAM,iBAAiB,GAAG,CAAC,CAAC;QAC5B,IAAI,YAAY,CAAC,MAAM,GAAG,iBAAiB,EAAE;YACzC,gCAAgC,CAAC,gBAAgB,EAAE,CAAC;SACvD;QACD,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;QAC7D,MAAM,wBAAwB,GAC1B,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY;YAC3B,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CACnD,WAAW,CAAC,EAAE,IAAI,gBAAM,CAAC,WAAW,EACpC,WAAW,CAAC,KAAK,EACjB,WAAW,CAAC,IAAI,CACnB,CAAC,CAAC,CACN,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAW,CAAC,IAAI,CAAC;YAC7B,MAAM,EAAE,gBAAM,CAAC,OAAO,CAAC,IAAI,CAAC;YAC5B,IAAI,EAAE,iBAAiB;SAC1B,CAAC,CAAC,CAAC;QAER,MAAM,KAAK,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;IACjD,CAAC;CACJ;AAzDD,4EAyDC"}
@@ -1,7 +1,7 @@
1
1
  import { Marionette } from "./types/marionette";
2
2
  import { SafeToImaSubmitter } from "./safe-to-ima-submitter";
3
- import { UnsignedTransaction } from "ethers";
3
+ import { Transaction } from "ethers";
4
4
  export declare class SafeImaMarionetteSubmitter extends SafeToImaSubmitter {
5
5
  marionette: Marionette;
6
- submit(transactions: UnsignedTransaction[]): Promise<void>;
6
+ submit(transactions: Transaction[]): Promise<void>;
7
7
  }
@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.SafeImaMarionetteSubmitter = void 0;
4
4
  const marionette_1 = require("./types/marionette");
5
5
  const safe_to_ima_submitter_1 = require("./safe-to-ima-submitter");
6
+ const ethers_1 = require("ethers");
6
7
  const hardhat_1 = require("hardhat");
7
8
  class SafeImaMarionetteSubmitter extends safe_to_ima_submitter_1.SafeToImaSubmitter {
8
9
  constructor() {
9
10
  super(...arguments);
10
- this.marionette = new hardhat_1.ethers.Contract(marionette_1.MARIONETTE_ADDRESS, new hardhat_1.ethers.utils.Interface([
11
+ this.marionette = new hardhat_1.ethers.BaseContract(marionette_1.MARIONETTE_ADDRESS, new hardhat_1.ethers.Interface([
11
12
  {
12
13
  "inputs": [
13
14
  {
@@ -48,20 +49,18 @@ class SafeImaMarionetteSubmitter extends safe_to_ima_submitter_1.SafeToImaSubmit
48
49
  }
49
50
  async submit(transactions) {
50
51
  const functionCalls = [];
51
- const zeroValue = 0;
52
52
  for (const transaction of transactions) {
53
53
  functionCalls.push({
54
- "data": transaction.data ?? "0x",
55
- "receiver": transaction.to ?? hardhat_1.ethers.constants.AddressZero,
56
- "value": transaction.value ?? zeroValue
54
+ "data": transaction.data,
55
+ "receiver": transaction.to ?? hardhat_1.ethers.ZeroAddress,
56
+ "value": transaction.value
57
57
  });
58
58
  }
59
- await super.submit([
60
- {
61
- "data": await this.marionette.
62
- encodeFunctionCalls(functionCalls),
63
- "to": this.marionette.address
64
- }
59
+ await super.submit([ethers_1.Transaction.from({
60
+ "data": hardhat_1.ethers.hexlify(await this.marionette.
61
+ encodeFunctionCalls(functionCalls)),
62
+ "to": await this.marionette.getAddress()
63
+ })
65
64
  ]);
66
65
  }
67
66
  }
@@ -1 +1 @@
1
- {"version":3,"file":"safe-ima-marionette-submitter.js","sourceRoot":"","sources":["../../../src/submitters/safe-ima-marionette-submitter.ts"],"names":[],"mappings":";;;AAAA,mDAAkE;AAClE,mEAA2D;AAE3D,qCAA+B;AAG/B,MAAa,0BAA2B,SAAQ,0CAAkB;IAAlE;;QACI,eAAU,GAAG,IAAI,gBAAM,CAAC,QAAQ,CAC5B,+BAAkB,EAClB,IAAI,gBAAM,CAAC,KAAK,CAAC,SAAS,CAAC;YACvB;gBACI,QAAQ,EAAE;oBACN;wBACI,YAAY,EAAE;4BACV;gCACI,cAAc,EAAE,SAAS;gCACzB,MAAM,EAAE,UAAU;gCAClB,MAAM,EAAE,SAAS;6BACpB;4BACD;gCACI,cAAc,EAAE,SAAS;gCACzB,MAAM,EAAE,OAAO;gCACf,MAAM,EAAE,SAAS;6BACpB;4BACD;gCACI,cAAc,EAAE,OAAO;gCACvB,MAAM,EAAE,MAAM;gCACd,MAAM,EAAE,OAAO;6BAClB;yBACJ;wBACD,cAAc,EAAE,mCAAmC;wBACnD,MAAM,EAAE,eAAe;wBACvB,MAAM,EAAE,SAAS;qBACpB;iBACJ;gBACD,MAAM,EAAE,qBAAqB;gBAC7B,SAAS,EAAE;oBACP;wBACI,cAAc,EAAE,OAAO;wBACvB,MAAM,EAAE,EAAE;wBACV,MAAM,EAAE,OAAO;qBAClB;iBACJ;gBACD,iBAAiB,EAAE,MAAM;gBACzB,MAAM,EAAE,UAAU;aACrB;SACJ,CAAC,EACF,gBAAM,CAAC,QAAQ,CACJ,CAAC;IAoBpB,CAAC;IAlBG,KAAK,CAAC,MAAM,CAAE,YAAmC;QAC7C,MAAM,aAAa,GAAG,EAAE,CAAC;QACzB,MAAM,SAAS,GAAG,CAAC,CAAC;QACpB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;YACpC,aAAa,CAAC,IAAI,CAAC;gBACf,MAAM,EAAE,WAAW,CAAC,IAAI,IAAI,IAAI;gBAChC,UAAU,EAAE,WAAW,CAAC,EAAE,IAAI,gBAAM,CAAC,SAAS,CAAC,WAAW;gBAC1D,OAAO,EAAE,WAAW,CAAC,KAAK,IAAI,SAAS;aAC1C,CAAC,CAAC;SACN;QACD,MAAM,KAAK,CAAC,MAAM,CAAC;YACf;gBACI,MAAM,EAAE,MAAM,IAAI,CAAC,UAAU;oBACzB,mBAAmB,CAAC,aAAa,CAAC;gBACtC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO;aAChC;SACJ,CAAC,CAAC;IACP,CAAC;CACJ;AA9DD,gEA8DC"}
1
+ {"version":3,"file":"safe-ima-marionette-submitter.js","sourceRoot":"","sources":["../../../src/submitters/safe-ima-marionette-submitter.ts"],"names":[],"mappings":";;;AAAA,mDAAkE;AAClE,mEAA2D;AAC3D,mCAAmC;AACnC,qCAA+B;AAG/B,MAAa,0BAA2B,SAAQ,0CAAkB;IAAlE;;QACI,eAAU,GAAG,IAAI,gBAAM,CAAC,YAAY,CAChC,+BAAkB,EAClB,IAAI,gBAAM,CAAC,SAAS,CAAC;YACjB;gBACI,QAAQ,EAAE;oBACN;wBACI,YAAY,EAAE;4BACV;gCACI,cAAc,EAAE,SAAS;gCACzB,MAAM,EAAE,UAAU;gCAClB,MAAM,EAAE,SAAS;6BACpB;4BACD;gCACI,cAAc,EAAE,SAAS;gCACzB,MAAM,EAAE,OAAO;gCACf,MAAM,EAAE,SAAS;6BACpB;4BACD;gCACI,cAAc,EAAE,OAAO;gCACvB,MAAM,EAAE,MAAM;gCACd,MAAM,EAAE,OAAO;6BAClB;yBACJ;wBACD,cAAc,EAAE,mCAAmC;wBACnD,MAAM,EAAE,eAAe;wBACvB,MAAM,EAAE,SAAS;qBACpB;iBACJ;gBACD,MAAM,EAAE,qBAAqB;gBAC7B,SAAS,EAAE;oBACP;wBACI,cAAc,EAAE,OAAO;wBACvB,MAAM,EAAE,EAAE;wBACV,MAAM,EAAE,OAAO;qBAClB;iBACJ;gBACD,iBAAiB,EAAE,MAAM;gBACzB,MAAM,EAAE,UAAU;aACrB;SACJ,CAAC,EACF,gBAAM,CAAC,QAAQ,CACJ,CAAC;IAkBpB,CAAC;IAhBG,KAAK,CAAC,MAAM,CAAE,YAA2B;QACrC,MAAM,aAAa,GAAG,EAAE,CAAC;QACzB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;YACpC,aAAa,CAAC,IAAI,CAAC;gBACf,MAAM,EAAE,WAAW,CAAC,IAAI;gBACxB,UAAU,EAAE,WAAW,CAAC,EAAE,IAAI,gBAAM,CAAC,WAAW;gBAChD,OAAO,EAAE,WAAW,CAAC,KAAK;aAC7B,CAAC,CAAC;SACN;QACD,MAAM,KAAK,CAAC,MAAM,CAAC,CAAC,oBAAW,CAAC,IAAI,CAAC;gBAC7B,MAAM,EAAE,gBAAM,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,UAAU;oBACxC,mBAAmB,CAAC,aAAa,CAAC,CAAC;gBACvC,IAAI,EAAE,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE;aAC3C,CAAC;SACL,CAAC,CAAC;IACP,CAAC;CACJ;AA5DD,gEA4DC"}
@@ -1,8 +1,8 @@
1
1
  import { Submitter } from "./submitter";
2
- import { UnsignedTransaction } from "ethers";
2
+ import { Transaction } from "ethers";
3
3
  export declare class SafeSubmitter extends Submitter {
4
4
  safeAddress: string;
5
- chainId: number | undefined;
6
- constructor(safeAddress: string, chainId?: number);
7
- submit(transactions: UnsignedTransaction[]): Promise<void>;
5
+ chainId: bigint | undefined;
6
+ constructor(safeAddress: string, chainId?: bigint);
7
+ submit(transactions: Transaction[]): Promise<void>;
8
8
  }
@@ -1 +1 @@
1
- {"version":3,"file":"safe-submitter.js","sourceRoot":"","sources":["../../../src/submitters/safe-submitter.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AAEtC,gDAA0D;AAC1D,qCAA+B;AAG/B,MAAa,aAAc,SAAQ,qBAAS;IAKxC,YAAa,WAAmB,EAAE,OAAgB;QAC9C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,MAAM,CAAE,YAAmC;QAC7C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,IAAI,CAAC,OAAO,GAAG,CAAC,MAAM,gBAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC;SAC/D;QACD,MAAM,IAAA,wCAA0B,EAC5B,IAAI,CAAC,WAAW,EAChB,YAAY,CACf,CAAC;IACN,CAAC;CACJ;AApBD,sCAoBC"}
1
+ {"version":3,"file":"safe-submitter.js","sourceRoot":"","sources":["../../../src/submitters/safe-submitter.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AAEtC,gDAA0D;AAC1D,qCAA+B;AAG/B,MAAa,aAAc,SAAQ,qBAAS;IAKxC,YAAa,WAAmB,EAAE,OAAgB;QAC9C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,MAAM,CAAE,YAA2B;QACrC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,IAAI,CAAC,OAAO,GAAG,CAAC,MAAM,gBAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC;SAC/D;QACD,MAAM,IAAA,wCAA0B,EAC5B,IAAI,CAAC,WAAW,EAChB,YAAY,CACf,CAAC;IACN,CAAC;CACJ;AApBD,sCAoBC"}
@@ -1,16 +1,16 @@
1
- import { BytesLike, UnsignedTransaction } from "ethers";
2
- import { Instance } from "@skalenetwork/skale-contracts-ethers-v5";
1
+ import { BytesLike, Transaction } from "ethers";
2
+ import { Instance } from "@skalenetwork/skale-contracts-ethers-v6";
3
3
  import { SafeSubmitter } from "./safe-submitter";
4
4
  interface Network {
5
5
  targetSchainHash: BytesLike;
6
- mainnetChainId?: number;
6
+ mainnetChainId?: bigint;
7
7
  }
8
8
  export declare class SafeToImaSubmitter extends SafeSubmitter {
9
9
  imaInstance: Instance;
10
10
  targetSchainHash: BytesLike;
11
11
  private messageProxyForMainnet;
12
12
  constructor(safeAddress: string, imaInstance: Instance, network: Network);
13
- submit(transactions: UnsignedTransaction[]): Promise<void>;
13
+ submit(transactions: Transaction[]): Promise<void>;
14
14
  private getMessageProxyForMainnet;
15
15
  }
16
16
  export {};