@safe-global/protocol-kit 0.1.1 → 1.0.1

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 (92) hide show
  1. package/README.md +47 -16
  2. package/dist/src/Safe.d.ts +13 -52
  3. package/dist/src/Safe.js +180 -57
  4. package/dist/src/Safe.js.map +1 -1
  5. package/dist/src/adapters/ethers/EthersAdapter.d.ts +8 -8
  6. package/dist/src/adapters/ethers/EthersAdapter.js +23 -31
  7. package/dist/src/adapters/ethers/EthersAdapter.js.map +1 -1
  8. package/dist/src/adapters/ethers/contracts/CreateCall/CreateCallEthersContract.d.ts +1 -1
  9. package/dist/src/adapters/ethers/contracts/CreateCall/CreateCallEthersContract.js +1 -1
  10. package/dist/src/adapters/ethers/contracts/GnosisSafe/GnosisSafeContractEthers.d.ts +1 -1
  11. package/dist/src/adapters/ethers/contracts/GnosisSafe/GnosisSafeContractEthers.js +1 -1
  12. package/dist/src/adapters/ethers/contracts/GnosisSafeProxyFactory/GnosisSafeProxyFactoryEthersContract.d.ts +1 -1
  13. package/dist/src/adapters/ethers/contracts/GnosisSafeProxyFactory/GnosisSafeProxyFactoryEthersContract.js +1 -1
  14. package/dist/src/adapters/ethers/contracts/SignMessageLib/SignMessageLibEthersContract.d.ts +1 -1
  15. package/dist/src/adapters/ethers/contracts/SignMessageLib/SignMessageLibEthersContract.js +1 -1
  16. package/dist/src/adapters/ethers/utils/index.d.ts +8 -0
  17. package/dist/src/adapters/ethers/utils/index.js +15 -1
  18. package/dist/src/adapters/ethers/utils/index.js.map +1 -1
  19. package/dist/src/adapters/web3/Web3Adapter.d.ts +8 -8
  20. package/dist/src/adapters/web3/Web3Adapter.js +17 -9
  21. package/dist/src/adapters/web3/Web3Adapter.js.map +1 -1
  22. package/dist/src/adapters/web3/contracts/CreateCall/CreateCallWeb3Contract.d.ts +1 -1
  23. package/dist/src/adapters/web3/contracts/CreateCall/CreateCallWeb3Contract.js +1 -6
  24. package/dist/src/adapters/web3/contracts/CreateCall/CreateCallWeb3Contract.js.map +1 -1
  25. package/dist/src/adapters/web3/contracts/GnosisSafe/GnosisSafeContractWeb3.d.ts +1 -1
  26. package/dist/src/adapters/web3/contracts/GnosisSafe/GnosisSafeContractWeb3.js +1 -6
  27. package/dist/src/adapters/web3/contracts/GnosisSafe/GnosisSafeContractWeb3.js.map +1 -1
  28. package/dist/src/adapters/web3/contracts/GnosisSafeProxyFactory/GnosisSafeProxyFactoryWeb3Contract.d.ts +1 -1
  29. package/dist/src/adapters/web3/contracts/GnosisSafeProxyFactory/GnosisSafeProxyFactoryWeb3Contract.js +1 -6
  30. package/dist/src/adapters/web3/contracts/GnosisSafeProxyFactory/GnosisSafeProxyFactoryWeb3Contract.js.map +1 -1
  31. package/dist/src/adapters/web3/contracts/SignMessageLib/SignMessageLibWeb3Contract.d.ts +1 -1
  32. package/dist/src/adapters/web3/contracts/SignMessageLib/SignMessageLibWeb3Contract.js +1 -6
  33. package/dist/src/adapters/web3/contracts/SignMessageLib/SignMessageLibWeb3Contract.js.map +1 -1
  34. package/dist/src/contracts/safeDeploymentContracts.d.ts +8 -9
  35. package/dist/src/contracts/safeDeploymentContracts.js +15 -15
  36. package/dist/src/contracts/safeDeploymentContracts.js.map +1 -1
  37. package/dist/src/contracts/utils.d.ts +21 -0
  38. package/dist/src/contracts/utils.js +105 -0
  39. package/dist/src/contracts/utils.js.map +1 -0
  40. package/dist/src/index.d.ts +8 -6
  41. package/dist/src/index.js +27 -20
  42. package/dist/src/index.js.map +1 -1
  43. package/dist/src/managers/contractManager.d.ts +4 -5
  44. package/dist/src/managers/contractManager.js +27 -22
  45. package/dist/src/managers/contractManager.js.map +1 -1
  46. package/dist/src/managers/fallbackHandlerManager.d.ts +1 -1
  47. package/dist/src/managers/fallbackHandlerManager.js +9 -0
  48. package/dist/src/managers/fallbackHandlerManager.js.map +1 -1
  49. package/dist/src/managers/guardManager.d.ts +1 -1
  50. package/dist/src/managers/guardManager.js +9 -0
  51. package/dist/src/managers/guardManager.js.map +1 -1
  52. package/dist/src/managers/moduleManager.d.ts +1 -1
  53. package/dist/src/managers/moduleManager.js +12 -0
  54. package/dist/src/managers/moduleManager.js.map +1 -1
  55. package/dist/src/managers/ownerManager.d.ts +1 -1
  56. package/dist/src/managers/ownerManager.js +21 -0
  57. package/dist/src/managers/ownerManager.js.map +1 -1
  58. package/dist/src/safeFactory/index.d.ts +5 -23
  59. package/dist/src/safeFactory/index.js +23 -63
  60. package/dist/src/safeFactory/index.js.map +1 -1
  61. package/dist/src/types/index.d.ts +114 -0
  62. package/dist/src/utils/eip-3770/config.js +11 -0
  63. package/dist/src/utils/eip-3770/config.js.map +1 -1
  64. package/dist/src/utils/index.d.ts +2 -1
  65. package/dist/src/utils/index.js +2 -1
  66. package/dist/src/utils/index.js.map +1 -1
  67. package/dist/src/utils/safeVersions.d.ts +2 -1
  68. package/dist/src/utils/safeVersions.js +3 -1
  69. package/dist/src/utils/safeVersions.js.map +1 -1
  70. package/dist/src/utils/signatures/SafeSignature.d.ts +1 -2
  71. package/dist/src/utils/signatures/SafeSignature.js +3 -2
  72. package/dist/src/utils/signatures/SafeSignature.js.map +1 -1
  73. package/dist/src/utils/signatures/index.d.ts +2 -12
  74. package/dist/src/utils/signatures/index.js +15 -90
  75. package/dist/src/utils/signatures/index.js.map +1 -1
  76. package/dist/src/utils/signatures/utils.d.ts +11 -0
  77. package/dist/src/utils/signatures/utils.js +91 -0
  78. package/dist/src/utils/signatures/utils.js.map +1 -0
  79. package/dist/src/utils/transactions/gas.d.ts +1 -1
  80. package/dist/src/utils/transactions/gas.js +10 -10
  81. package/dist/src/utils/transactions/gas.js.map +1 -1
  82. package/dist/src/utils/transactions/utils.d.ts +3 -2
  83. package/dist/src/utils/transactions/utils.js +27 -14
  84. package/dist/src/utils/transactions/utils.js.map +1 -1
  85. package/dist/src/utils/types.d.ts +2 -0
  86. package/dist/src/utils/types.js +8 -0
  87. package/dist/src/utils/types.js.map +1 -0
  88. package/dist/tsconfig.build.tsbuildinfo +1 -1
  89. package/package.json +5 -4
  90. package/dist/src/safeFactory/utils.d.ts +0 -3
  91. package/dist/src/safeFactory/utils.js +0 -19
  92. package/dist/src/safeFactory/utils.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"GnosisSafeProxyFactoryWeb3Contract.js","sourceRoot":"","sources":["../../../../../../src/adapters/web3/contracts/GnosisSafeProxyFactory/GnosisSafeProxyFactoryWeb3Contract.ts"],"names":[],"mappings":";;AAAA,wDAAoD;AAOpD,yEAA0E;AAU1E,MAAM,kCAAkC;IACtC,YAAmB,QAAyE;QAAzE,aAAQ,GAAR,QAAQ,CAAiE;IAAG,CAAC;IAEhG,UAAU;QACR,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAA;IACtC,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,IAAI,EAAE,CAAA;IACzD,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,EAChB,qBAAqB,EACrB,WAAW,EACX,SAAS,EACT,OAAO,EACP,QAAQ,EACS;;QACjB,IAAI,qBAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAA;QACjE,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;YAC3B,OAAO,CAAC,GAAG,GAAG,MAAM,IAAI,CAAC,WAAW,CAClC,sBAAsB,EACtB,CAAC,qBAAqB,EAAE,WAAW,EAAE,SAAS,CAAC,EAC/C;gBACE,GAAG,OAAO;aACX,CACF,CAAA;SACF;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO;aACrC,oBAAoB,CAAC,qBAAqB,EAAE,WAAW,EAAE,SAAS,CAAC;aACnE,IAAI,CAAC,OAAO,CAAC,CAAA;QAEhB,IAAI,QAAQ,EAAE;YACZ,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAU,EAAC,UAAU,CAAC,CAAA;YAC7C,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;SACxB;QAED,MAAM,QAAQ,GAAuB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CACzE,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,OAA2B,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAC5F,CAAA;QACD,MAAM,YAAY,GAAG,MAAA,MAAA,MAAA,QAAQ,CAAC,MAAM,0CAAE,aAAa,0CAAE,YAAY,0CAAE,KAAK,CAAA;QACxE,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;SACxD;QACD,OAAO,YAAY,CAAA;IACrB,CAAC;IAED,MAAM,CAAC,UAAkB,EAAE,MAAa;QACtC,OAAQ,IAAI,CAAC,QAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,SAAS,EAAE,CAAA;IAC1E,CAAC;IAED,KAAK,CAAC,WAAW,CACf,UAAkB,EAClB,MAAa,EACb,OAA+B;QAE/B,IAAI;YACF,OAAO,MAAM,CACX,MAAO,IAAI,CAAC,QAAQ,CAAC,OAAe,CAAC,UAAU,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CACjF,CAAA;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;SAC7B;IACH,CAAC;CACF;AAED,kBAAe,kCAAkC,CAAA"}
1
+ {"version":3,"file":"GnosisSafeProxyFactoryWeb3Contract.js","sourceRoot":"","sources":["../../../../../../src/adapters/web3/contracts/GnosisSafeProxyFactory/GnosisSafeProxyFactoryWeb3Contract.ts"],"names":[],"mappings":";;AAAA,wDAAoD;AAOpD,yEAA0E;AAU1E,MAAM,kCAAkC;IACtC,YAAmB,QAAyE;QAAzE,aAAQ,GAAR,QAAQ,CAAiE;IAAG,CAAC;IAEhG,UAAU;QACR,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAA;IACtC,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,IAAI,EAAE,CAAA;IACzD,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,EAChB,qBAAqB,EACrB,WAAW,EACX,SAAS,EACT,OAAO,EACP,QAAQ,EACS;;QACjB,IAAI,qBAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAA;QACjE,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;YAC3B,OAAO,CAAC,GAAG,GAAG,MAAM,IAAI,CAAC,WAAW,CAClC,sBAAsB,EACtB,CAAC,qBAAqB,EAAE,WAAW,EAAE,SAAS,CAAC,EAC/C;gBACE,GAAG,OAAO;aACX,CACF,CAAA;SACF;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO;aACrC,oBAAoB,CAAC,qBAAqB,EAAE,WAAW,EAAE,SAAS,CAAC;aACnE,IAAI,CAAC,OAAO,CAAC,CAAA;QAEhB,IAAI,QAAQ,EAAE;YACZ,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAU,EAAC,UAAU,CAAC,CAAA;YAC7C,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;SACxB;QAED,MAAM,QAAQ,GAAuB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CACzE,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,OAA2B,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAC5F,CAAA;QACD,MAAM,YAAY,GAAG,MAAA,MAAA,MAAA,QAAQ,CAAC,MAAM,0CAAE,aAAa,0CAAE,YAAY,0CAAE,KAAK,CAAA;QACxE,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;SACxD;QACD,OAAO,YAAY,CAAA;IACrB,CAAC;IAED,MAAM,CAAC,UAAkB,EAAE,MAAa;QACtC,OAAQ,IAAI,CAAC,QAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,SAAS,EAAE,CAAA;IAC1E,CAAC;IAED,KAAK,CAAC,WAAW,CACf,UAAkB,EAClB,MAAa,EACb,OAA+B;QAE/B,OAAO,CACL,MAAO,IAAI,CAAC,QAAQ,CAAC,OAAe,CAAC,UAAU,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CACjF,CAAC,QAAQ,EAAE,CAAA;IACd,CAAC;CACF;AAED,kBAAe,kCAAkC,CAAA"}
@@ -8,6 +8,6 @@ declare abstract class SignMessageLibWeb3Contract implements SignMessageLibContr
8
8
  signMessage(data: string, options?: Web3TransactionOptions): Promise<Web3TransactionResult>;
9
9
  getMessageHash(message: string): Promise<string>;
10
10
  encode(methodName: string, params: any[]): string;
11
- estimateGas(methodName: string, params: any[], options: Web3TransactionOptions): Promise<number>;
11
+ estimateGas(methodName: string, params: any[], options: Web3TransactionOptions): Promise<string>;
12
12
  }
13
13
  export default SignMessageLibWeb3Contract;
@@ -22,12 +22,7 @@ class SignMessageLibWeb3Contract {
22
22
  return this.contract.methods[methodName](...params).encodeABI();
23
23
  }
24
24
  async estimateGas(methodName, params, options) {
25
- try {
26
- return Number(await this.contract.methods[methodName](...params).estimateGas(options));
27
- }
28
- catch (error) {
29
- return Promise.reject(error);
30
- }
25
+ return (await this.contract.methods[methodName](...params).estimateGas(options)).toString();
31
26
  }
32
27
  }
33
28
  exports.default = SignMessageLibWeb3Contract;
@@ -1 +1 @@
1
- {"version":3,"file":"SignMessageLibWeb3Contract.js","sourceRoot":"","sources":["../../../../../../src/adapters/web3/contracts/SignMessageLib/SignMessageLibWeb3Contract.ts"],"names":[],"mappings":";;AAMA,yEAA0E;AAE1E,MAAe,0BAA0B;IACvC,YAAmB,QAA+B;QAA/B,aAAQ,GAAR,QAAQ,CAAuB;IAAG,CAAC;IAEtD,UAAU;QACR,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAA;IACtC,CAAC;IAED,KAAK,CAAC,WAAW,CACf,IAAY,EACZ,OAAgC;QAEhC,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;YAC3B,OAAO,CAAC,GAAG,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,OAAO,EAAE,CAAC,CAAA;SAC5E;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACxE,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,OAAO,CAAC,CAAA;IACxC,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAe;QAClC,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;IAC7D,CAAC;IAED,MAAM,CAAC,UAAkB,EAAE,MAAa;QACtC,OAAQ,IAAI,CAAC,QAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,SAAS,EAAE,CAAA;IAC1E,CAAC;IAED,KAAK,CAAC,WAAW,CACf,UAAkB,EAClB,MAAa,EACb,OAA+B;QAE/B,IAAI;YACF,OAAO,MAAM,CACX,MAAO,IAAI,CAAC,QAAQ,CAAC,OAAe,CAAC,UAAU,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CACjF,CAAA;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;SAC7B;IACH,CAAC;CACF;AAED,kBAAe,0BAA0B,CAAA"}
1
+ {"version":3,"file":"SignMessageLibWeb3Contract.js","sourceRoot":"","sources":["../../../../../../src/adapters/web3/contracts/SignMessageLib/SignMessageLibWeb3Contract.ts"],"names":[],"mappings":";;AAMA,yEAA0E;AAE1E,MAAe,0BAA0B;IACvC,YAAmB,QAA+B;QAA/B,aAAQ,GAAR,QAAQ,CAAuB;IAAG,CAAC;IAEtD,UAAU;QACR,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAA;IACtC,CAAC;IAED,KAAK,CAAC,WAAW,CACf,IAAY,EACZ,OAAgC;QAEhC,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;YAC3B,OAAO,CAAC,GAAG,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,OAAO,EAAE,CAAC,CAAA;SAC5E;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACxE,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,OAAO,CAAC,CAAA;IACxC,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAe;QAClC,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;IAC7D,CAAC;IAED,MAAM,CAAC,UAAkB,EAAE,MAAa;QACtC,OAAQ,IAAI,CAAC,QAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,SAAS,EAAE,CAAA;IAC1E,CAAC;IAED,KAAK,CAAC,WAAW,CACf,UAAkB,EAClB,MAAa,EACb,OAA+B;QAE/B,OAAO,CACL,MAAO,IAAI,CAAC,QAAQ,CAAC,OAAe,CAAC,UAAU,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CACjF,CAAC,QAAQ,EAAE,CAAA;IACd,CAAC;CACF;AAED,kBAAe,0BAA0B,CAAA"}
@@ -1,10 +1,9 @@
1
+ import { ContractNetworkConfig } from '../types';
1
2
  import { CompatibilityFallbackHandlerContract, CreateCallContract, EthAdapter, GnosisSafeContract, GnosisSafeProxyFactoryContract, MultiSendCallOnlyContract, MultiSendContract, SafeVersion, SignMessageLibContract } from '@safe-global/safe-core-sdk-types';
2
3
  import { SingletonDeployment } from '@safe-global/safe-deployments';
3
- import { ContractNetworkConfig } from '../types';
4
4
  interface GetContractInstanceProps {
5
5
  ethAdapter: EthAdapter;
6
6
  safeVersion: SafeVersion;
7
- chainId: number;
8
7
  customContracts?: ContractNetworkConfig;
9
8
  }
10
9
  interface GetSafeContractInstanceProps extends GetContractInstanceProps {
@@ -18,11 +17,11 @@ export declare function getMultiSendContractDeployment(safeVersion: SafeVersion,
18
17
  export declare function getSafeProxyFactoryContractDeployment(safeVersion: SafeVersion, chainId: number): SingletonDeployment | undefined;
19
18
  export declare function getSignMessageLibContractDeployment(safeVersion: SafeVersion, chainId: number): SingletonDeployment | undefined;
20
19
  export declare function getCreateCallContractDeployment(safeVersion: SafeVersion, chainId: number): SingletonDeployment | undefined;
21
- export declare function getSafeContract({ ethAdapter, safeVersion, chainId, customSafeAddress, isL1SafeMasterCopy, customContracts }: GetSafeContractInstanceProps): Promise<GnosisSafeContract>;
22
- export declare function getProxyFactoryContract({ ethAdapter, safeVersion, chainId, customContracts }: GetContractInstanceProps): Promise<GnosisSafeProxyFactoryContract>;
23
- export declare function getCompatibilityFallbackHandlerContract({ ethAdapter, safeVersion, chainId, customContracts }: GetContractInstanceProps): Promise<CompatibilityFallbackHandlerContract>;
24
- export declare function getMultiSendContract({ ethAdapter, safeVersion, chainId, customContracts }: GetContractInstanceProps): Promise<MultiSendContract>;
25
- export declare function getMultiSendCallOnlyContract({ ethAdapter, safeVersion, chainId, customContracts }: GetContractInstanceProps): Promise<MultiSendCallOnlyContract>;
26
- export declare function getSignMessageLibContract({ ethAdapter, safeVersion, chainId, customContracts }: GetContractInstanceProps): Promise<SignMessageLibContract>;
27
- export declare function getCreateCallContract({ ethAdapter, safeVersion, chainId, customContracts }: GetContractInstanceProps): Promise<CreateCallContract>;
20
+ export declare function getSafeContract({ ethAdapter, safeVersion, customSafeAddress, isL1SafeMasterCopy, customContracts }: GetSafeContractInstanceProps): Promise<GnosisSafeContract>;
21
+ export declare function getProxyFactoryContract({ ethAdapter, safeVersion, customContracts }: GetContractInstanceProps): Promise<GnosisSafeProxyFactoryContract>;
22
+ export declare function getCompatibilityFallbackHandlerContract({ ethAdapter, safeVersion, customContracts }: GetContractInstanceProps): Promise<CompatibilityFallbackHandlerContract>;
23
+ export declare function getMultiSendContract({ ethAdapter, safeVersion, customContracts }: GetContractInstanceProps): Promise<MultiSendContract>;
24
+ export declare function getMultiSendCallOnlyContract({ ethAdapter, safeVersion, customContracts }: GetContractInstanceProps): Promise<MultiSendCallOnlyContract>;
25
+ export declare function getSignMessageLibContract({ ethAdapter, safeVersion, customContracts }: GetContractInstanceProps): Promise<SignMessageLibContract>;
26
+ export declare function getCreateCallContract({ ethAdapter, safeVersion, customContracts }: GetContractInstanceProps): Promise<CreateCallContract>;
28
27
  export {};
@@ -46,11 +46,11 @@ function getCreateCallContractDeployment(safeVersion, chainId) {
46
46
  return (0, safe_deployments_1.getCreateCallDeployment)({ version, network: chainId.toString(), released: true });
47
47
  }
48
48
  exports.getCreateCallContractDeployment = getCreateCallContractDeployment;
49
- async function getSafeContract({ ethAdapter, safeVersion, chainId, customSafeAddress, isL1SafeMasterCopy, customContracts }) {
49
+ async function getSafeContract({ ethAdapter, safeVersion, customSafeAddress, isL1SafeMasterCopy, customContracts }) {
50
+ const chainId = await ethAdapter.getChainId();
50
51
  const singletonDeployment = getSafeContractDeployment(safeVersion, chainId, isL1SafeMasterCopy);
51
- const gnosisSafeContract = ethAdapter.getSafeContract({
52
+ const gnosisSafeContract = await ethAdapter.getSafeContract({
52
53
  safeVersion,
53
- chainId,
54
54
  singletonDeployment,
55
55
  customContractAddress: customSafeAddress !== null && customSafeAddress !== void 0 ? customSafeAddress : customContracts === null || customContracts === void 0 ? void 0 : customContracts.safeMasterCopyAddress,
56
56
  customContractAbi: customContracts === null || customContracts === void 0 ? void 0 : customContracts.safeMasterCopyAbi
@@ -62,11 +62,11 @@ async function getSafeContract({ ethAdapter, safeVersion, chainId, customSafeAdd
62
62
  return gnosisSafeContract;
63
63
  }
64
64
  exports.getSafeContract = getSafeContract;
65
- async function getProxyFactoryContract({ ethAdapter, safeVersion, chainId, customContracts }) {
65
+ async function getProxyFactoryContract({ ethAdapter, safeVersion, customContracts }) {
66
+ const chainId = await ethAdapter.getChainId();
66
67
  const proxyFactoryDeployment = getSafeProxyFactoryContractDeployment(safeVersion, chainId);
67
68
  const safeProxyFactoryContract = await ethAdapter.getSafeProxyFactoryContract({
68
69
  safeVersion,
69
- chainId,
70
70
  singletonDeployment: proxyFactoryDeployment,
71
71
  customContractAddress: customContracts === null || customContracts === void 0 ? void 0 : customContracts.safeProxyFactoryAddress,
72
72
  customContractAbi: customContracts === null || customContracts === void 0 ? void 0 : customContracts.safeProxyFactoryAbi
@@ -78,11 +78,11 @@ async function getProxyFactoryContract({ ethAdapter, safeVersion, chainId, custo
78
78
  return safeProxyFactoryContract;
79
79
  }
80
80
  exports.getProxyFactoryContract = getProxyFactoryContract;
81
- async function getCompatibilityFallbackHandlerContract({ ethAdapter, safeVersion, chainId, customContracts }) {
81
+ async function getCompatibilityFallbackHandlerContract({ ethAdapter, safeVersion, customContracts }) {
82
+ const chainId = await ethAdapter.getChainId();
82
83
  const fallbackHandlerDeployment = getCompatibilityFallbackHandlerContractDeployment(safeVersion, chainId);
83
84
  const fallbackHandlerContract = await ethAdapter.getCompatibilityFallbackHandlerContract({
84
85
  safeVersion,
85
- chainId,
86
86
  singletonDeployment: fallbackHandlerDeployment,
87
87
  customContractAddress: customContracts === null || customContracts === void 0 ? void 0 : customContracts.fallbackHandlerAddress,
88
88
  customContractAbi: customContracts === null || customContracts === void 0 ? void 0 : customContracts.fallbackHandlerAbi
@@ -94,11 +94,11 @@ async function getCompatibilityFallbackHandlerContract({ ethAdapter, safeVersion
94
94
  return fallbackHandlerContract;
95
95
  }
96
96
  exports.getCompatibilityFallbackHandlerContract = getCompatibilityFallbackHandlerContract;
97
- async function getMultiSendContract({ ethAdapter, safeVersion, chainId, customContracts }) {
97
+ async function getMultiSendContract({ ethAdapter, safeVersion, customContracts }) {
98
+ const chainId = await ethAdapter.getChainId();
98
99
  const multiSendDeployment = getMultiSendContractDeployment(safeVersion, chainId);
99
100
  const multiSendContract = await ethAdapter.getMultiSendContract({
100
101
  safeVersion,
101
- chainId,
102
102
  singletonDeployment: multiSendDeployment,
103
103
  customContractAddress: customContracts === null || customContracts === void 0 ? void 0 : customContracts.multiSendAddress,
104
104
  customContractAbi: customContracts === null || customContracts === void 0 ? void 0 : customContracts.multiSendAbi
@@ -110,11 +110,11 @@ async function getMultiSendContract({ ethAdapter, safeVersion, chainId, customCo
110
110
  return multiSendContract;
111
111
  }
112
112
  exports.getMultiSendContract = getMultiSendContract;
113
- async function getMultiSendCallOnlyContract({ ethAdapter, safeVersion, chainId, customContracts }) {
113
+ async function getMultiSendCallOnlyContract({ ethAdapter, safeVersion, customContracts }) {
114
+ const chainId = await ethAdapter.getChainId();
114
115
  const multiSendCallOnlyDeployment = getMultiSendCallOnlyContractDeployment(safeVersion, chainId);
115
116
  const multiSendCallOnlyContract = await ethAdapter.getMultiSendCallOnlyContract({
116
117
  safeVersion,
117
- chainId,
118
118
  singletonDeployment: multiSendCallOnlyDeployment,
119
119
  customContractAddress: customContracts === null || customContracts === void 0 ? void 0 : customContracts.multiSendCallOnlyAddress,
120
120
  customContractAbi: customContracts === null || customContracts === void 0 ? void 0 : customContracts.multiSendCallOnlyAbi
@@ -126,11 +126,11 @@ async function getMultiSendCallOnlyContract({ ethAdapter, safeVersion, chainId,
126
126
  return multiSendCallOnlyContract;
127
127
  }
128
128
  exports.getMultiSendCallOnlyContract = getMultiSendCallOnlyContract;
129
- async function getSignMessageLibContract({ ethAdapter, safeVersion, chainId, customContracts }) {
129
+ async function getSignMessageLibContract({ ethAdapter, safeVersion, customContracts }) {
130
+ const chainId = await ethAdapter.getChainId();
130
131
  const signMessageLibDeployment = getSignMessageLibContractDeployment(safeVersion, chainId);
131
132
  const signMessageLibContract = await ethAdapter.getSignMessageLibContract({
132
133
  safeVersion,
133
- chainId,
134
134
  singletonDeployment: signMessageLibDeployment,
135
135
  customContractAddress: customContracts === null || customContracts === void 0 ? void 0 : customContracts.signMessageLibAddress,
136
136
  customContractAbi: customContracts === null || customContracts === void 0 ? void 0 : customContracts.signMessageLibAbi
@@ -142,11 +142,11 @@ async function getSignMessageLibContract({ ethAdapter, safeVersion, chainId, cus
142
142
  return signMessageLibContract;
143
143
  }
144
144
  exports.getSignMessageLibContract = getSignMessageLibContract;
145
- async function getCreateCallContract({ ethAdapter, safeVersion, chainId, customContracts }) {
145
+ async function getCreateCallContract({ ethAdapter, safeVersion, customContracts }) {
146
+ const chainId = await ethAdapter.getChainId();
146
147
  const createCallDeployment = getCreateCallContractDeployment(safeVersion, chainId);
147
148
  const createCallContract = await ethAdapter.getCreateCallContract({
148
149
  safeVersion,
149
- chainId,
150
150
  singletonDeployment: createCallDeployment,
151
151
  customContractAddress: customContracts === null || customContracts === void 0 ? void 0 : customContracts.createCallAddress,
152
152
  customContractAbi: customContracts === null || customContracts === void 0 ? void 0 : customContracts.createCallAbi
@@ -1 +1 @@
1
- {"version":3,"file":"safeDeploymentContracts.js","sourceRoot":"","sources":["../../../src/contracts/safeDeploymentContracts.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"safeDeploymentContracts.js","sourceRoot":"","sources":["../../../src/contracts/safeDeploymentContracts.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,21 @@
1
+ import { EthAdapter, GnosisSafeContract, GnosisSafeProxyFactoryContract } from '@safe-global/safe-core-sdk-types';
2
+ import { ContractNetworkConfig, SafeAccountConfig, SafeDeploymentConfig } from '../types';
3
+ export declare const PREDETERMINED_SALT_NONCE = "0xb1073742015cbcf5a3a4d9d1ae33ecf619439710b89475f92e2abd2117e90f90";
4
+ export interface PredictSafeAddressProps {
5
+ ethAdapter: EthAdapter;
6
+ safeAccountConfig: SafeAccountConfig;
7
+ safeDeploymentConfig?: SafeDeploymentConfig;
8
+ isL1SafeMasterCopy?: boolean;
9
+ customContracts?: ContractNetworkConfig;
10
+ }
11
+ export interface encodeSetupCallDataProps {
12
+ ethAdapter: EthAdapter;
13
+ safeAccountConfig: SafeAccountConfig;
14
+ safeContract: GnosisSafeContract;
15
+ customContracts?: ContractNetworkConfig;
16
+ }
17
+ export declare function encodeCreateProxyWithNonce(safeProxyFactoryContract: GnosisSafeProxyFactoryContract, safeSingletonAddress: string, initializer: string): string;
18
+ export declare function encodeSetupCallData({ ethAdapter, safeAccountConfig, safeContract, customContracts }: encodeSetupCallDataProps): Promise<string>;
19
+ export declare function predictSafeAddress({ ethAdapter, safeAccountConfig, safeDeploymentConfig, isL1SafeMasterCopy, customContracts }: PredictSafeAddressProps): Promise<string>;
20
+ export declare const validateSafeAccountConfig: ({ owners, threshold }: SafeAccountConfig) => void;
21
+ export declare const validateSafeDeploymentConfig: ({ saltNonce }: SafeDeploymentConfig) => void;
@@ -0,0 +1,105 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.validateSafeDeploymentConfig = exports.validateSafeAccountConfig = exports.predictSafeAddress = exports.encodeSetupCallData = exports.encodeCreateProxyWithNonce = exports.PREDETERMINED_SALT_NONCE = void 0;
7
+ const ethereumjs_util_1 = require("ethereumjs-util");
8
+ const address_1 = require("@ethersproject/address");
9
+ const bignumber_1 = require("@ethersproject/bignumber");
10
+ const satisfies_1 = __importDefault(require("semver/functions/satisfies"));
11
+ const safeDeploymentContracts_1 = require("../contracts/safeDeploymentContracts");
12
+ const constants_1 = require("../utils/constants");
13
+ const config_1 = require("../contracts/config");
14
+ // keccak256(toUtf8Bytes('Safe Account Abstraction'))
15
+ exports.PREDETERMINED_SALT_NONCE = '0xb1073742015cbcf5a3a4d9d1ae33ecf619439710b89475f92e2abd2117e90f90';
16
+ function encodeCreateProxyWithNonce(safeProxyFactoryContract, safeSingletonAddress, initializer) {
17
+ return safeProxyFactoryContract.encode('createProxyWithNonce', [
18
+ safeSingletonAddress,
19
+ initializer,
20
+ exports.PREDETERMINED_SALT_NONCE
21
+ ]);
22
+ }
23
+ exports.encodeCreateProxyWithNonce = encodeCreateProxyWithNonce;
24
+ async function encodeSetupCallData({ ethAdapter, safeAccountConfig, safeContract, customContracts }) {
25
+ const { owners, threshold, to = constants_1.ZERO_ADDRESS, data = constants_1.EMPTY_DATA, fallbackHandler, paymentToken = constants_1.ZERO_ADDRESS, payment = 0, paymentReceiver = constants_1.ZERO_ADDRESS } = safeAccountConfig;
26
+ const safeVersion = await safeContract.getVersion();
27
+ if ((0, satisfies_1.default)(safeVersion, '<=1.0.0')) {
28
+ return safeContract.encode('setup', [
29
+ owners,
30
+ threshold,
31
+ to,
32
+ data,
33
+ paymentToken,
34
+ payment,
35
+ paymentReceiver
36
+ ]);
37
+ }
38
+ let fallbackHandlerAddress = fallbackHandler;
39
+ const isValidAddress = fallbackHandlerAddress !== undefined && (0, address_1.isAddress)(fallbackHandlerAddress);
40
+ if (!isValidAddress) {
41
+ const fallbackHandlerContract = await (0, safeDeploymentContracts_1.getCompatibilityFallbackHandlerContract)({
42
+ ethAdapter,
43
+ safeVersion,
44
+ customContracts
45
+ });
46
+ fallbackHandlerAddress = fallbackHandlerContract.getAddress();
47
+ }
48
+ return safeContract.encode('setup', [
49
+ owners,
50
+ threshold,
51
+ to,
52
+ data,
53
+ fallbackHandlerAddress,
54
+ paymentToken,
55
+ payment,
56
+ paymentReceiver
57
+ ]);
58
+ }
59
+ exports.encodeSetupCallData = encodeSetupCallData;
60
+ async function predictSafeAddress({ ethAdapter, safeAccountConfig, safeDeploymentConfig = {}, isL1SafeMasterCopy = false, customContracts }) {
61
+ (0, exports.validateSafeAccountConfig)(safeAccountConfig);
62
+ (0, exports.validateSafeDeploymentConfig)(safeDeploymentConfig);
63
+ const { safeVersion = config_1.SAFE_LAST_VERSION, saltNonce = exports.PREDETERMINED_SALT_NONCE } = safeDeploymentConfig;
64
+ const safeProxyFactoryContract = await (0, safeDeploymentContracts_1.getProxyFactoryContract)({
65
+ ethAdapter,
66
+ safeVersion,
67
+ customContracts
68
+ });
69
+ const proxyCreationCode = await safeProxyFactoryContract.proxyCreationCode();
70
+ const safeContract = await (0, safeDeploymentContracts_1.getSafeContract)({
71
+ ethAdapter,
72
+ safeVersion,
73
+ isL1SafeMasterCopy,
74
+ customContracts
75
+ });
76
+ const initializer = await encodeSetupCallData({
77
+ ethAdapter,
78
+ safeAccountConfig,
79
+ safeContract,
80
+ customContracts
81
+ });
82
+ const encodedNonce = (0, ethereumjs_util_1.toBuffer)(ethAdapter.encodeParameters(['uint256'], [saltNonce])).toString('hex');
83
+ const salt = (0, ethereumjs_util_1.keccak256)((0, ethereumjs_util_1.toBuffer)('0x' + (0, ethereumjs_util_1.keccak256)((0, ethereumjs_util_1.toBuffer)(initializer)).toString('hex') + encodedNonce));
84
+ const constructorData = (0, ethereumjs_util_1.toBuffer)(ethAdapter.encodeParameters(['address'], [safeContract.getAddress()])).toString('hex');
85
+ const initCode = proxyCreationCode + constructorData;
86
+ const proxyAddress = '0x' +
87
+ (0, ethereumjs_util_1.generateAddress2)((0, ethereumjs_util_1.toBuffer)(safeProxyFactoryContract.getAddress()), (0, ethereumjs_util_1.toBuffer)(salt), (0, ethereumjs_util_1.toBuffer)(initCode)).toString('hex');
88
+ return ethAdapter.getChecksummedAddress(proxyAddress);
89
+ }
90
+ exports.predictSafeAddress = predictSafeAddress;
91
+ const validateSafeAccountConfig = ({ owners, threshold }) => {
92
+ if (owners.length <= 0)
93
+ throw new Error('Owner list must have at least one owner');
94
+ if (threshold <= 0)
95
+ throw new Error('Threshold must be greater than or equal to 1');
96
+ if (threshold > owners.length)
97
+ throw new Error('Threshold must be lower than or equal to owners length');
98
+ };
99
+ exports.validateSafeAccountConfig = validateSafeAccountConfig;
100
+ const validateSafeDeploymentConfig = ({ saltNonce }) => {
101
+ if (saltNonce && bignumber_1.BigNumber.from(saltNonce).lt(0))
102
+ throw new Error('saltNonce must be greater than or equal to 0');
103
+ };
104
+ exports.validateSafeDeploymentConfig = validateSafeDeploymentConfig;
105
+ //# sourceMappingURL=utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/contracts/utils.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,13 @@
1
+ import { CreateCallEthersContract, CreateProxyProps as CreateEthersProxyProps, EthersAdapter, EthersAdapterConfig, EthersTransactionOptions, EthersTransactionResult, GnosisSafeContractEthers, GnosisSafeProxyFactoryEthersContract, MultiSendCallOnlyEthersContract, MultiSendEthersContract, SignMessageLibEthersContract } from './adapters/ethers';
2
+ import { CreateCallWeb3Contract, CreateProxyProps as CreateWeb3ProxyProps, GnosisSafeContractWeb3, GnosisSafeProxyFactoryWeb3Contract, MultiSendCallOnlyWeb3Contract, MultiSendWeb3Contract, SignMessageLibWeb3Contract, Web3Adapter, Web3AdapterConfig, Web3TransactionOptions, Web3TransactionResult } from './adapters/web3';
1
3
  import { getCompatibilityFallbackHandlerContract, getCreateCallContract, getMultiSendCallOnlyContract, getMultiSendContract, getProxyFactoryContract, getSafeContract, getSignMessageLibContract } from './contracts/safeDeploymentContracts';
4
+ import { predictSafeAddress, encodeSetupCallData, encodeCreateProxyWithNonce, PREDETERMINED_SALT_NONCE } from './contracts/utils';
2
5
  import ContractManager from './managers/contractManager';
3
- import Safe, { AddOwnerTxParams, ConnectSafeConfig, CreateTransactionProps, RemoveOwnerTxParams, SafeConfig, SwapOwnerTxParams } from './Safe';
4
- import SafeFactory, { DeploySafeProps, PredictSafeProps, SafeAccountConfig, SafeDeploymentConfig, SafeFactoryConfig } from './safeFactory';
5
- import { EthersAdapter, EthersAdapterConfig, EthersTransactionOptions, EthersTransactionResult, CreateProxyProps as CreateEthersProxyProps, CreateCallEthersContract, GnosisSafeContractEthers, GnosisSafeProxyFactoryEthersContract, MultiSendEthersContract, MultiSendCallOnlyEthersContract, SignMessageLibEthersContract } from './adapters/ethers';
6
- import { Web3Adapter, Web3AdapterConfig, Web3TransactionOptions, CreateProxyProps as CreateWeb3ProxyProps, Web3TransactionResult, CreateCallWeb3Contract, GnosisSafeContractWeb3, GnosisSafeProxyFactoryWeb3Contract, MultiSendWeb3Contract, MultiSendCallOnlyWeb3Contract, SignMessageLibWeb3Contract } from './adapters/web3';
7
- import { ContractNetworksConfig } from './types';
6
+ import Safe from './Safe';
7
+ import SafeFactory, { DeploySafeProps, SafeFactoryConfig } from './safeFactory';
8
+ import { AddOwnerTxParams, ConnectSafeConfig, ConnectSafeConfigWithPredictedSafe, ConnectSafeConfigWithSafeAddress, ContractNetworksConfig, CreateTransactionProps, PredictedSafeProps, RemoveOwnerTxParams, SafeAccountConfig, SafeConfig, SafeConfigWithPredictedSafe, SafeConfigWithSafeAddress, SafeDeploymentConfig, StandardizeSafeTransactionDataProps, SwapOwnerTxParams } from './types';
9
+ import { EthSafeSignature } from './utils';
8
10
  import { SafeTransactionOptionalProps } from './utils/transactions/types';
9
11
  import { encodeMultiSendData, standardizeSafeTransactionData } from './utils/transactions/utils';
10
- export { ContractManager, SafeFactory, SafeFactoryConfig, SafeAccountConfig, SafeDeploymentConfig, PredictSafeProps, DeploySafeProps, SafeConfig, ConnectSafeConfig, ContractNetworksConfig, SafeTransactionOptionalProps, CreateTransactionProps, AddOwnerTxParams, RemoveOwnerTxParams, SwapOwnerTxParams, encodeMultiSendData, standardizeSafeTransactionData, EthersAdapter, EthersAdapterConfig, EthersTransactionOptions, EthersTransactionResult, CreateEthersProxyProps, CreateCallEthersContract, GnosisSafeContractEthers, GnosisSafeProxyFactoryEthersContract, MultiSendEthersContract, MultiSendCallOnlyEthersContract, SignMessageLibEthersContract, Web3Adapter, Web3AdapterConfig, Web3TransactionOptions, CreateWeb3ProxyProps, Web3TransactionResult, CreateCallWeb3Contract, GnosisSafeContractWeb3, GnosisSafeProxyFactoryWeb3Contract, MultiSendWeb3Contract, MultiSendCallOnlyWeb3Contract, SignMessageLibWeb3Contract, getSafeContract, getProxyFactoryContract, getCompatibilityFallbackHandlerContract, getMultiSendContract, getMultiSendCallOnlyContract, getSignMessageLibContract, getCreateCallContract };
12
+ export { ContractManager, SafeFactory, SafeFactoryConfig, SafeAccountConfig, SafeDeploymentConfig, PredictedSafeProps, DeploySafeProps, SafeConfig, SafeConfigWithSafeAddress, SafeConfigWithPredictedSafe, ConnectSafeConfig, ConnectSafeConfigWithSafeAddress, ConnectSafeConfigWithPredictedSafe, ContractNetworksConfig, SafeTransactionOptionalProps, CreateTransactionProps, AddOwnerTxParams, RemoveOwnerTxParams, SwapOwnerTxParams, encodeMultiSendData, standardizeSafeTransactionData, StandardizeSafeTransactionDataProps, EthersAdapter, EthersAdapterConfig, EthersTransactionOptions, EthersTransactionResult, CreateEthersProxyProps, CreateCallEthersContract, GnosisSafeContractEthers, GnosisSafeProxyFactoryEthersContract, MultiSendEthersContract, MultiSendCallOnlyEthersContract, SignMessageLibEthersContract, Web3Adapter, Web3AdapterConfig, Web3TransactionOptions, CreateWeb3ProxyProps, Web3TransactionResult, CreateCallWeb3Contract, GnosisSafeContractWeb3, GnosisSafeProxyFactoryWeb3Contract, MultiSendWeb3Contract, MultiSendCallOnlyWeb3Contract, SignMessageLibWeb3Contract, getSafeContract, getProxyFactoryContract, getCompatibilityFallbackHandlerContract, getMultiSendContract, getMultiSendCallOnlyContract, getSignMessageLibContract, getCreateCallContract, predictSafeAddress, encodeSetupCallData, PREDETERMINED_SALT_NONCE, encodeCreateProxyWithNonce, EthSafeSignature };
11
13
  export default Safe;
package/dist/src/index.js CHANGED
@@ -3,7 +3,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.getCreateCallContract = exports.getSignMessageLibContract = exports.getMultiSendCallOnlyContract = exports.getMultiSendContract = exports.getCompatibilityFallbackHandlerContract = exports.getProxyFactoryContract = exports.getSafeContract = exports.SignMessageLibWeb3Contract = exports.MultiSendCallOnlyWeb3Contract = exports.MultiSendWeb3Contract = exports.GnosisSafeProxyFactoryWeb3Contract = exports.GnosisSafeContractWeb3 = exports.CreateCallWeb3Contract = exports.Web3Adapter = exports.SignMessageLibEthersContract = exports.MultiSendCallOnlyEthersContract = exports.MultiSendEthersContract = exports.GnosisSafeProxyFactoryEthersContract = exports.GnosisSafeContractEthers = exports.CreateCallEthersContract = exports.EthersAdapter = exports.standardizeSafeTransactionData = exports.encodeMultiSendData = exports.SafeFactory = exports.ContractManager = void 0;
6
+ exports.EthSafeSignature = exports.encodeCreateProxyWithNonce = exports.PREDETERMINED_SALT_NONCE = exports.encodeSetupCallData = exports.predictSafeAddress = exports.getCreateCallContract = exports.getSignMessageLibContract = exports.getMultiSendCallOnlyContract = exports.getMultiSendContract = exports.getCompatibilityFallbackHandlerContract = exports.getProxyFactoryContract = exports.getSafeContract = exports.SignMessageLibWeb3Contract = exports.MultiSendCallOnlyWeb3Contract = exports.MultiSendWeb3Contract = exports.GnosisSafeProxyFactoryWeb3Contract = exports.GnosisSafeContractWeb3 = exports.CreateCallWeb3Contract = exports.Web3Adapter = exports.SignMessageLibEthersContract = exports.MultiSendCallOnlyEthersContract = exports.MultiSendEthersContract = exports.GnosisSafeProxyFactoryEthersContract = exports.GnosisSafeContractEthers = exports.CreateCallEthersContract = exports.EthersAdapter = exports.standardizeSafeTransactionData = exports.encodeMultiSendData = exports.SafeFactory = exports.ContractManager = void 0;
7
+ const ethers_1 = require("./adapters/ethers");
8
+ Object.defineProperty(exports, "CreateCallEthersContract", { enumerable: true, get: function () { return ethers_1.CreateCallEthersContract; } });
9
+ Object.defineProperty(exports, "EthersAdapter", { enumerable: true, get: function () { return ethers_1.EthersAdapter; } });
10
+ Object.defineProperty(exports, "GnosisSafeContractEthers", { enumerable: true, get: function () { return ethers_1.GnosisSafeContractEthers; } });
11
+ Object.defineProperty(exports, "GnosisSafeProxyFactoryEthersContract", { enumerable: true, get: function () { return ethers_1.GnosisSafeProxyFactoryEthersContract; } });
12
+ Object.defineProperty(exports, "MultiSendCallOnlyEthersContract", { enumerable: true, get: function () { return ethers_1.MultiSendCallOnlyEthersContract; } });
13
+ Object.defineProperty(exports, "MultiSendEthersContract", { enumerable: true, get: function () { return ethers_1.MultiSendEthersContract; } });
14
+ Object.defineProperty(exports, "SignMessageLibEthersContract", { enumerable: true, get: function () { return ethers_1.SignMessageLibEthersContract; } });
15
+ const web3_1 = require("./adapters/web3");
16
+ Object.defineProperty(exports, "CreateCallWeb3Contract", { enumerable: true, get: function () { return web3_1.CreateCallWeb3Contract; } });
17
+ Object.defineProperty(exports, "GnosisSafeContractWeb3", { enumerable: true, get: function () { return web3_1.GnosisSafeContractWeb3; } });
18
+ Object.defineProperty(exports, "GnosisSafeProxyFactoryWeb3Contract", { enumerable: true, get: function () { return web3_1.GnosisSafeProxyFactoryWeb3Contract; } });
19
+ Object.defineProperty(exports, "MultiSendCallOnlyWeb3Contract", { enumerable: true, get: function () { return web3_1.MultiSendCallOnlyWeb3Contract; } });
20
+ Object.defineProperty(exports, "MultiSendWeb3Contract", { enumerable: true, get: function () { return web3_1.MultiSendWeb3Contract; } });
21
+ Object.defineProperty(exports, "SignMessageLibWeb3Contract", { enumerable: true, get: function () { return web3_1.SignMessageLibWeb3Contract; } });
22
+ Object.defineProperty(exports, "Web3Adapter", { enumerable: true, get: function () { return web3_1.Web3Adapter; } });
7
23
  const safeDeploymentContracts_1 = require("./contracts/safeDeploymentContracts");
8
24
  Object.defineProperty(exports, "getCompatibilityFallbackHandlerContract", { enumerable: true, get: function () { return safeDeploymentContracts_1.getCompatibilityFallbackHandlerContract; } });
9
25
  Object.defineProperty(exports, "getCreateCallContract", { enumerable: true, get: function () { return safeDeploymentContracts_1.getCreateCallContract; } });
@@ -12,29 +28,20 @@ Object.defineProperty(exports, "getMultiSendContract", { enumerable: true, get:
12
28
  Object.defineProperty(exports, "getProxyFactoryContract", { enumerable: true, get: function () { return safeDeploymentContracts_1.getProxyFactoryContract; } });
13
29
  Object.defineProperty(exports, "getSafeContract", { enumerable: true, get: function () { return safeDeploymentContracts_1.getSafeContract; } });
14
30
  Object.defineProperty(exports, "getSignMessageLibContract", { enumerable: true, get: function () { return safeDeploymentContracts_1.getSignMessageLibContract; } });
31
+ const utils_1 = require("./contracts/utils");
32
+ Object.defineProperty(exports, "predictSafeAddress", { enumerable: true, get: function () { return utils_1.predictSafeAddress; } });
33
+ Object.defineProperty(exports, "encodeSetupCallData", { enumerable: true, get: function () { return utils_1.encodeSetupCallData; } });
34
+ Object.defineProperty(exports, "encodeCreateProxyWithNonce", { enumerable: true, get: function () { return utils_1.encodeCreateProxyWithNonce; } });
35
+ Object.defineProperty(exports, "PREDETERMINED_SALT_NONCE", { enumerable: true, get: function () { return utils_1.PREDETERMINED_SALT_NONCE; } });
15
36
  const contractManager_1 = __importDefault(require("./managers/contractManager"));
16
37
  exports.ContractManager = contractManager_1.default;
17
38
  const Safe_1 = __importDefault(require("./Safe"));
18
39
  const safeFactory_1 = __importDefault(require("./safeFactory"));
19
40
  exports.SafeFactory = safeFactory_1.default;
20
- const ethers_1 = require("./adapters/ethers");
21
- Object.defineProperty(exports, "EthersAdapter", { enumerable: true, get: function () { return ethers_1.EthersAdapter; } });
22
- Object.defineProperty(exports, "CreateCallEthersContract", { enumerable: true, get: function () { return ethers_1.CreateCallEthersContract; } });
23
- Object.defineProperty(exports, "GnosisSafeContractEthers", { enumerable: true, get: function () { return ethers_1.GnosisSafeContractEthers; } });
24
- Object.defineProperty(exports, "GnosisSafeProxyFactoryEthersContract", { enumerable: true, get: function () { return ethers_1.GnosisSafeProxyFactoryEthersContract; } });
25
- Object.defineProperty(exports, "MultiSendEthersContract", { enumerable: true, get: function () { return ethers_1.MultiSendEthersContract; } });
26
- Object.defineProperty(exports, "MultiSendCallOnlyEthersContract", { enumerable: true, get: function () { return ethers_1.MultiSendCallOnlyEthersContract; } });
27
- Object.defineProperty(exports, "SignMessageLibEthersContract", { enumerable: true, get: function () { return ethers_1.SignMessageLibEthersContract; } });
28
- const web3_1 = require("./adapters/web3");
29
- Object.defineProperty(exports, "Web3Adapter", { enumerable: true, get: function () { return web3_1.Web3Adapter; } });
30
- Object.defineProperty(exports, "CreateCallWeb3Contract", { enumerable: true, get: function () { return web3_1.CreateCallWeb3Contract; } });
31
- Object.defineProperty(exports, "GnosisSafeContractWeb3", { enumerable: true, get: function () { return web3_1.GnosisSafeContractWeb3; } });
32
- Object.defineProperty(exports, "GnosisSafeProxyFactoryWeb3Contract", { enumerable: true, get: function () { return web3_1.GnosisSafeProxyFactoryWeb3Contract; } });
33
- Object.defineProperty(exports, "MultiSendWeb3Contract", { enumerable: true, get: function () { return web3_1.MultiSendWeb3Contract; } });
34
- Object.defineProperty(exports, "MultiSendCallOnlyWeb3Contract", { enumerable: true, get: function () { return web3_1.MultiSendCallOnlyWeb3Contract; } });
35
- Object.defineProperty(exports, "SignMessageLibWeb3Contract", { enumerable: true, get: function () { return web3_1.SignMessageLibWeb3Contract; } });
36
- const utils_1 = require("./utils/transactions/utils");
37
- Object.defineProperty(exports, "encodeMultiSendData", { enumerable: true, get: function () { return utils_1.encodeMultiSendData; } });
38
- Object.defineProperty(exports, "standardizeSafeTransactionData", { enumerable: true, get: function () { return utils_1.standardizeSafeTransactionData; } });
41
+ const utils_2 = require("./utils");
42
+ Object.defineProperty(exports, "EthSafeSignature", { enumerable: true, get: function () { return utils_2.EthSafeSignature; } });
43
+ const utils_3 = require("./utils/transactions/utils");
44
+ Object.defineProperty(exports, "encodeMultiSendData", { enumerable: true, get: function () { return utils_3.encodeMultiSendData; } });
45
+ Object.defineProperty(exports, "standardizeSafeTransactionData", { enumerable: true, get: function () { return utils_3.standardizeSafeTransactionData; } });
39
46
  exports.default = Safe_1.default;
40
47
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,iFAQ4C;AA0F1C,wHAjGA,iEAAuC,OAiGA;AAIvC,sGApGA,+CAAqB,OAoGA;AAFrB,6GAjGA,sDAA4B,OAiGA;AAD5B,qGA/FA,8CAAoB,OA+FA;AAFpB,wGA5FA,iDAAuB,OA4FA;AADvB,gGA1FA,yCAAe,OA0FA;AAKf,0GA9FA,mDAAyB,OA8FA;AA5F3B,iFAAwD;AAgDtD,0BAhDK,yBAAe,CAgDL;AA/CjB,kDAOe;AACf,gEAMsB;AAkCpB,sBAxCK,qBAAW,CAwCL;AAjCb,8CAY0B;AAqCxB,8FAhDA,sBAAa,OAgDA;AAKb,yGAhDA,iCAAwB,OAgDA;AACxB,yGAhDA,iCAAwB,OAgDA;AACxB,qHAhDA,6CAAoC,OAgDA;AACpC,wGAhDA,gCAAuB,OAgDA;AACvB,gHAhDA,wCAA+B,OAgDA;AAC/B,6GAhDA,qCAA4B,OAgDA;AA9C9B,0CAYwB;AAmCtB,4FA9CA,kBAAW,OA8CA;AAKX,uGA9CA,6BAAsB,OA8CA;AACtB,uGA9CA,6BAAsB,OA8CA;AACtB,mHA9CA,yCAAkC,OA8CA;AAClC,sGA9CA,4BAAqB,OA8CA;AACrB,8GA9CA,oCAA6B,OA8CA;AAC7B,2GA9CA,iCAA0B,OA8CA;AAzC5B,sDAAgG;AAkB9F,oGAlBO,2BAAmB,OAkBP;AACnB,+GAnB4B,sCAA8B,OAmB5B;AAgChC,kBAAe,cAAI,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,8CAY0B;AAiFxB,yGA5FA,iCAAwB,OA4FA;AALxB,8FArFA,sBAAa,OAqFA;AAMb,yGAvFA,iCAAwB,OAuFA;AACxB,qHAvFA,6CAAoC,OAuFA;AAEpC,gHAxFA,wCAA+B,OAwFA;AAD/B,wGAtFA,gCAAuB,OAsFA;AAEvB,6GAvFA,qCAA4B,OAuFA;AArF9B,0CAYwB;AA+EtB,uGA1FA,6BAAsB,OA0FA;AACtB,uGAzFA,6BAAsB,OAyFA;AACtB,mHAzFA,yCAAkC,OAyFA;AAElC,8GA1FA,oCAA6B,OA0FA;AAD7B,sGAxFA,4BAAqB,OAwFA;AAErB,2GAzFA,iCAA0B,OAyFA;AAV1B,4FA9EA,kBAAW,OA8EA;AAzEb,iFAQ4C;AA8E1C,wHArFA,iEAAuC,OAqFA;AAIvC,sGAxFA,+CAAqB,OAwFA;AAFrB,6GArFA,sDAA4B,OAqFA;AAD5B,qGAnFA,8CAAoB,OAmFA;AAFpB,wGAhFA,iDAAuB,OAgFA;AADvB,gGA9EA,yCAAe,OA8EA;AAKf,0GAlFA,mDAAyB,OAkFA;AAhF3B,6CAK0B;AA6ExB,mGAjFA,0BAAkB,OAiFA;AAClB,oGAjFA,2BAAmB,OAiFA;AAEnB,2GAlFA,kCAA0B,OAkFA;AAD1B,yGAhFA,gCAAwB,OAgFA;AA9E1B,iFAAwD;AAyBtD,0BAzBK,yBAAe,CAyBL;AAxBjB,kDAAyB;AACzB,gEAA+E;AAwB7E,sBAxBK,qBAAW,CAwBL;AANb,mCAA0C;AA4DxC,iGA5DO,wBAAgB,OA4DP;AA1DlB,sDAAgG;AAsB9F,oGAtBO,2BAAmB,OAsBP;AACnB,+GAvB4B,sCAA8B,OAuB5B;AAsChC,kBAAe,cAAI,CAAA"}
@@ -1,13 +1,12 @@
1
+ import { ContractNetworksConfig, SafeConfig } from '../types';
1
2
  import { GnosisSafeContract, MultiSendCallOnlyContract, MultiSendContract } from '@safe-global/safe-core-sdk-types';
2
- import { SafeConfig } from '../Safe';
3
- import { ContractNetworksConfig } from '../types';
4
3
  declare class ContractManager {
5
4
  #private;
6
- static create({ ethAdapter, safeAddress, isL1SafeMasterCopy, contractNetworks }: SafeConfig): Promise<ContractManager>;
7
- init({ ethAdapter, safeAddress, isL1SafeMasterCopy, contractNetworks }: SafeConfig): Promise<void>;
5
+ static create(config: SafeConfig): Promise<ContractManager>;
6
+ init(config: SafeConfig): Promise<void>;
8
7
  get contractNetworks(): ContractNetworksConfig | undefined;
9
8
  get isL1SafeMasterCopy(): boolean | undefined;
10
- get safeContract(): GnosisSafeContract;
9
+ get safeContract(): GnosisSafeContract | undefined;
11
10
  get multiSendContract(): MultiSendContract;
12
11
  get multiSendCallOnlyContract(): MultiSendCallOnlyContract;
13
12
  }
@@ -14,6 +14,7 @@ var _ContractManager_contractNetworks, _ContractManager_isL1SafeMasterCopy, _Con
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  const config_1 = require("../contracts/config");
16
16
  const safeDeploymentContracts_1 = require("../contracts/safeDeploymentContracts");
17
+ const types_1 = require("../utils/types");
17
18
  class ContractManager {
18
19
  constructor() {
19
20
  _ContractManager_contractNetworks.set(this, void 0);
@@ -22,43 +23,47 @@ class ContractManager {
22
23
  _ContractManager_multiSendContract.set(this, void 0);
23
24
  _ContractManager_multiSendCallOnlyContract.set(this, void 0);
24
25
  }
25
- static async create({ ethAdapter, safeAddress, isL1SafeMasterCopy, contractNetworks }) {
26
+ static async create(config) {
26
27
  const contractManager = new ContractManager();
27
- await contractManager.init({ ethAdapter, safeAddress, isL1SafeMasterCopy, contractNetworks });
28
+ await contractManager.init(config);
28
29
  return contractManager;
29
30
  }
30
- async init({ ethAdapter, safeAddress, isL1SafeMasterCopy, contractNetworks }) {
31
+ async init(config) {
32
+ var _a, _b;
33
+ const { ethAdapter, isL1SafeMasterCopy, contractNetworks } = config;
31
34
  const chainId = await ethAdapter.getChainId();
32
35
  const customContracts = contractNetworks === null || contractNetworks === void 0 ? void 0 : contractNetworks[chainId];
33
36
  __classPrivateFieldSet(this, _ContractManager_contractNetworks, contractNetworks, "f");
34
37
  __classPrivateFieldSet(this, _ContractManager_isL1SafeMasterCopy, isL1SafeMasterCopy, "f");
35
- const temporarySafeContract = await (0, safeDeploymentContracts_1.getSafeContract)({
36
- ethAdapter,
37
- safeVersion: config_1.SAFE_LAST_VERSION,
38
- chainId,
39
- isL1SafeMasterCopy,
40
- customSafeAddress: safeAddress,
41
- customContracts
42
- });
43
- const safeVersion = await temporarySafeContract.getVersion();
44
- __classPrivateFieldSet(this, _ContractManager_safeContract, await (0, safeDeploymentContracts_1.getSafeContract)({
45
- ethAdapter,
46
- safeVersion,
47
- chainId,
48
- isL1SafeMasterCopy,
49
- customSafeAddress: safeAddress,
50
- customContracts
51
- }), "f");
38
+ let safeVersion;
39
+ if ((0, types_1.isSafeConfigWithPredictedSafe)(config)) {
40
+ safeVersion = (_b = (_a = config.predictedSafe.safeDeploymentConfig) === null || _a === void 0 ? void 0 : _a.safeVersion) !== null && _b !== void 0 ? _b : config_1.SAFE_LAST_VERSION;
41
+ }
42
+ else {
43
+ const temporarySafeContract = await (0, safeDeploymentContracts_1.getSafeContract)({
44
+ ethAdapter,
45
+ safeVersion: config_1.SAFE_LAST_VERSION,
46
+ isL1SafeMasterCopy,
47
+ customSafeAddress: config.safeAddress,
48
+ customContracts
49
+ });
50
+ safeVersion = await temporarySafeContract.getVersion();
51
+ __classPrivateFieldSet(this, _ContractManager_safeContract, await (0, safeDeploymentContracts_1.getSafeContract)({
52
+ ethAdapter,
53
+ safeVersion,
54
+ isL1SafeMasterCopy,
55
+ customSafeAddress: config.safeAddress,
56
+ customContracts
57
+ }), "f");
58
+ }
52
59
  __classPrivateFieldSet(this, _ContractManager_multiSendContract, await (0, safeDeploymentContracts_1.getMultiSendContract)({
53
60
  ethAdapter,
54
61
  safeVersion,
55
- chainId,
56
62
  customContracts
57
63
  }), "f");
58
64
  __classPrivateFieldSet(this, _ContractManager_multiSendCallOnlyContract, await (0, safeDeploymentContracts_1.getMultiSendCallOnlyContract)({
59
65
  ethAdapter,
60
66
  safeVersion,
61
- chainId,
62
67
  customContracts
63
68
  }), "f");
64
69
  }
@@ -1 +1 @@
1
- {"version":3,"file":"contractManager.js","sourceRoot":"","sources":["../../../src/managers/contractManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAKA,uEAA8E;AAC9E,yGAIoE;AAIpE,MAAM,eAAe;IAArB;QACE,oDAA0C;QAC1C,sDAA6B;QAC7B,gDAAkC;QAClC,qDAAsC;QACtC,6DAAsD;IA0ExD,CAAC;IAxEC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAClB,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,gBAAgB,EACL;QACX,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QAC7C,MAAM,eAAe,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,CAAC,CAAA;QAC7F,OAAO,eAAe,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EACT,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,gBAAgB,EACL;QACX,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,UAAU,EAAE,CAAA;QAC7C,MAAM,eAAe,GAAG,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAG,OAAO,CAAC,CAAA;QACnD,uBAAA,IAAI,qCAAqB,gBAAgB,MAAA,CAAA;QACzC,uBAAA,IAAI,uCAAuB,kBAAkB,MAAA,CAAA;QAE7C,MAAM,qBAAqB,GAAG,MAAM,IAAA,yCAAe,EAAC;YAClD,UAAU;YACV,WAAW,EAAE,0BAAiB;YAC9B,OAAO;YACP,kBAAkB;YAClB,iBAAiB,EAAE,WAAW;YAC9B,eAAe;SAChB,CAAC,CAAA;QACF,MAAM,WAAW,GAAG,MAAM,qBAAqB,CAAC,UAAU,EAAE,CAAA;QAC5D,uBAAA,IAAI,iCAAiB,MAAM,IAAA,yCAAe,EAAC;YACzC,UAAU;YACV,WAAW;YACX,OAAO;YACP,kBAAkB;YAClB,iBAAiB,EAAE,WAAW;YAC9B,eAAe;SAChB,CAAC,MAAA,CAAA;QACF,uBAAA,IAAI,sCAAsB,MAAM,IAAA,8CAAoB,EAAC;YACnD,UAAU;YACV,WAAW;YACX,OAAO;YACP,eAAe;SAChB,CAAC,MAAA,CAAA;QACF,uBAAA,IAAI,8CAA8B,MAAM,IAAA,sDAA4B,EAAC;YACnE,UAAU;YACV,WAAW;YACX,OAAO;YACP,eAAe;SAChB,CAAC,MAAA,CAAA;IACJ,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,uBAAA,IAAI,yCAAkB,CAAA;IAC/B,CAAC;IAED,IAAI,kBAAkB;QACpB,OAAO,uBAAA,IAAI,2CAAoB,CAAA;IACjC,CAAC;IAED,IAAI,YAAY;QACd,OAAO,uBAAA,IAAI,qCAAc,CAAA;IAC3B,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,uBAAA,IAAI,0CAAmB,CAAA;IAChC,CAAC;IAED,IAAI,yBAAyB;QAC3B,OAAO,uBAAA,IAAI,kDAA2B,CAAA;IACxC,CAAC;CACF;;AAED,kBAAe,eAAe,CAAA"}
1
+ {"version":3,"file":"contractManager.js","sourceRoot":"","sources":["../../../src/managers/contractManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,uEAA8E;AAC9E,yGAIoE;AAQpE,0CAA8D;AAE9D,MAAM,eAAe;IAArB;QACE,oDAA0C;QAC1C,sDAA6B;QAC7B,gDAAkC;QAClC,qDAAsC;QACtC,6DAAsD;IAqExD,CAAC;IAnEC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAkB;QACpC,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QAC7C,MAAM,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAClC,OAAO,eAAe,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAkB;;QAC3B,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,GAAG,MAAM,CAAA;QAEnE,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,UAAU,EAAE,CAAA;QAC7C,MAAM,eAAe,GAAG,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAG,OAAO,CAAC,CAAA;QACnD,uBAAA,IAAI,qCAAqB,gBAAgB,MAAA,CAAA;QACzC,uBAAA,IAAI,uCAAuB,kBAAkB,MAAA,CAAA;QAE7C,IAAI,WAAwB,CAAA;QAE5B,IAAI,IAAA,qCAA6B,EAAC,MAAM,CAAC,EAAE;YACzC,WAAW,GAAG,MAAA,MAAA,MAAM,CAAC,aAAa,CAAC,oBAAoB,0CAAE,WAAW,mCAAI,0BAAiB,CAAA;SAC1F;aAAM;YACL,MAAM,qBAAqB,GAAG,MAAM,IAAA,yCAAe,EAAC;gBAClD,UAAU;gBACV,WAAW,EAAE,0BAAiB;gBAC9B,kBAAkB;gBAClB,iBAAiB,EAAE,MAAM,CAAC,WAAW;gBACrC,eAAe;aAChB,CAAC,CAAA;YACF,WAAW,GAAG,MAAM,qBAAqB,CAAC,UAAU,EAAE,CAAA;YACtD,uBAAA,IAAI,iCAAiB,MAAM,IAAA,yCAAe,EAAC;gBACzC,UAAU;gBACV,WAAW;gBACX,kBAAkB;gBAClB,iBAAiB,EAAE,MAAM,CAAC,WAAW;gBACrC,eAAe;aAChB,CAAC,MAAA,CAAA;SACH;QAED,uBAAA,IAAI,sCAAsB,MAAM,IAAA,8CAAoB,EAAC;YACnD,UAAU;YACV,WAAW;YACX,eAAe;SAChB,CAAC,MAAA,CAAA;QACF,uBAAA,IAAI,8CAA8B,MAAM,IAAA,sDAA4B,EAAC;YACnE,UAAU;YACV,WAAW;YACX,eAAe;SAChB,CAAC,MAAA,CAAA;IACJ,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,uBAAA,IAAI,yCAAkB,CAAA;IAC/B,CAAC;IAED,IAAI,kBAAkB;QACpB,OAAO,uBAAA,IAAI,2CAAoB,CAAA;IACjC,CAAC;IAED,IAAI,YAAY;QACd,OAAO,uBAAA,IAAI,qCAAc,CAAA;IAC3B,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,uBAAA,IAAI,0CAAmB,CAAA;IAChC,CAAC;IAED,IAAI,yBAAyB;QAC3B,OAAO,uBAAA,IAAI,kDAA2B,CAAA;IACxC,CAAC;CACF;;AAED,kBAAe,eAAe,CAAA"}
@@ -1,7 +1,7 @@
1
1
  import { EthAdapter, GnosisSafeContract } from '@safe-global/safe-core-sdk-types';
2
2
  declare class FallbackHandlerManager {
3
3
  #private;
4
- constructor(ethAdapter: EthAdapter, safeContract: GnosisSafeContract);
4
+ constructor(ethAdapter: EthAdapter, safeContract?: GnosisSafeContract);
5
5
  private validateFallbackHandlerAddress;
6
6
  private validateFallbackHandlerIsNotEnabled;
7
7
  private validateFallbackHandlerIsEnabled;