@hyperlane-xyz/sdk 7.3.0-zksyncbeta2.0 → 8.0.0-beta.0

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 (281) hide show
  1. package/dist/consts/multisigIsm.d.ts.map +1 -1
  2. package/dist/consts/multisigIsm.js +227 -7
  3. package/dist/consts/multisigIsm.js.map +1 -1
  4. package/dist/contracts/contracts.d.ts +1 -2
  5. package/dist/contracts/contracts.d.ts.map +1 -1
  6. package/dist/contracts/contracts.js.map +1 -1
  7. package/dist/core/EvmCoreModule.d.ts +1 -14
  8. package/dist/core/EvmCoreModule.d.ts.map +1 -1
  9. package/dist/core/EvmCoreModule.js +3 -23
  10. package/dist/core/EvmCoreModule.js.map +1 -1
  11. package/dist/core/EvmCoreReader.d.ts.map +1 -1
  12. package/dist/core/EvmCoreReader.js.map +1 -1
  13. package/dist/core/HyperlaneCore.d.ts +1 -2
  14. package/dist/core/HyperlaneCore.d.ts.map +1 -1
  15. package/dist/core/HyperlaneCore.js +4 -8
  16. package/dist/core/HyperlaneCore.js.map +1 -1
  17. package/dist/core/HyperlaneRelayer.d.ts +73 -73
  18. package/dist/core/HyperlaneRelayer.d.ts.map +1 -1
  19. package/dist/core/HyperlaneRelayer.js +22 -0
  20. package/dist/core/HyperlaneRelayer.js.map +1 -1
  21. package/dist/core/types.d.ts +5688 -1
  22. package/dist/core/types.d.ts.map +1 -1
  23. package/dist/core/types.js +29 -0
  24. package/dist/core/types.js.map +1 -1
  25. package/dist/deploy/HyperlaneDeployer.d.ts +1 -3
  26. package/dist/deploy/HyperlaneDeployer.d.ts.map +1 -1
  27. package/dist/deploy/HyperlaneDeployer.js +13 -44
  28. package/dist/deploy/HyperlaneDeployer.js.map +1 -1
  29. package/dist/deploy/proxy.d.ts +5 -8
  30. package/dist/deploy/proxy.d.ts.map +1 -1
  31. package/dist/deploy/proxy.js.map +1 -1
  32. package/dist/deploy/types.d.ts +26 -3
  33. package/dist/deploy/types.d.ts.map +1 -1
  34. package/dist/deploy/types.js +10 -0
  35. package/dist/deploy/types.js.map +1 -1
  36. package/dist/deploy/verify/ContractVerifier.d.ts +20 -20
  37. package/dist/deploy/verify/ContractVerifier.d.ts.map +1 -1
  38. package/dist/deploy/verify/ContractVerifier.js +171 -57
  39. package/dist/deploy/verify/ContractVerifier.js.map +1 -1
  40. package/dist/deploy/verify/types.d.ts +0 -8
  41. package/dist/deploy/verify/types.d.ts.map +1 -1
  42. package/dist/deploy/verify/types.js.map +1 -1
  43. package/dist/deploy/verify/utils.d.ts +1 -17
  44. package/dist/deploy/verify/utils.d.ts.map +1 -1
  45. package/dist/deploy/verify/utils.js +1 -25
  46. package/dist/deploy/verify/utils.js.map +1 -1
  47. package/dist/gcp/storage.d.ts +6 -2
  48. package/dist/gcp/storage.d.ts.map +1 -1
  49. package/dist/gcp/storage.js +41 -22
  50. package/dist/gcp/storage.js.map +1 -1
  51. package/dist/hook/EvmHookModule.d.ts.map +1 -1
  52. package/dist/hook/EvmHookModule.js +2 -2
  53. package/dist/hook/EvmHookModule.js.map +1 -1
  54. package/dist/hook/types.d.ts +1 -3
  55. package/dist/hook/types.d.ts.map +1 -1
  56. package/dist/hook/types.js +1 -12
  57. package/dist/hook/types.js.map +1 -1
  58. package/dist/ica/EvmIcaReader.d.ts.map +1 -1
  59. package/dist/ica/EvmIcaReader.js +1 -1
  60. package/dist/ica/EvmIcaReader.js.map +1 -1
  61. package/dist/ica/types.d.ts +105 -1
  62. package/dist/ica/types.d.ts.map +1 -1
  63. package/dist/ica/types.js +24 -1
  64. package/dist/ica/types.js.map +1 -1
  65. package/dist/index.d.ts +29 -41
  66. package/dist/index.d.ts.map +1 -1
  67. package/dist/index.js +30 -31
  68. package/dist/index.js.map +1 -1
  69. package/dist/ism/EvmIsmModule.d.ts.map +1 -1
  70. package/dist/ism/EvmIsmModule.js +1 -1
  71. package/dist/ism/EvmIsmModule.js.map +1 -1
  72. package/dist/ism/HyperlaneIsmFactory.d.ts +2 -7
  73. package/dist/ism/HyperlaneIsmFactory.d.ts.map +1 -1
  74. package/dist/ism/HyperlaneIsmFactory.js +9 -31
  75. package/dist/ism/HyperlaneIsmFactory.js.map +1 -1
  76. package/dist/ism/types.d.ts +1 -2
  77. package/dist/ism/types.d.ts.map +1 -1
  78. package/dist/ism/types.js +1 -1
  79. package/dist/ism/types.js.map +1 -1
  80. package/dist/metadata/agentConfig.d.ts +955 -230
  81. package/dist/metadata/agentConfig.d.ts.map +1 -1
  82. package/dist/metadata/agentConfig.js +50 -0
  83. package/dist/metadata/agentConfig.js.map +1 -1
  84. package/dist/metadata/blockExplorer.js +1 -1
  85. package/dist/metadata/blockExplorer.js.map +1 -1
  86. package/dist/metadata/chainMetadataTypes.d.ts +1 -2
  87. package/dist/metadata/chainMetadataTypes.d.ts.map +1 -1
  88. package/dist/metadata/chainMetadataTypes.js +1 -2
  89. package/dist/metadata/chainMetadataTypes.js.map +1 -1
  90. package/dist/metadata/matchingList.d.ts +6 -0
  91. package/dist/metadata/matchingList.d.ts.map +1 -1
  92. package/dist/metadata/matchingList.js +1 -0
  93. package/dist/metadata/matchingList.js.map +1 -1
  94. package/dist/middleware/account/types.d.ts +88 -1
  95. package/dist/middleware/account/types.d.ts.map +1 -1
  96. package/dist/middleware/account/types.js +18 -1
  97. package/dist/middleware/account/types.js.map +1 -1
  98. package/dist/providers/MultiProvider.d.ts +1 -3
  99. package/dist/providers/MultiProvider.d.ts.map +1 -1
  100. package/dist/providers/MultiProvider.js +19 -48
  101. package/dist/providers/MultiProvider.js.map +1 -1
  102. package/dist/providers/ProviderType.d.ts +3 -21
  103. package/dist/providers/ProviderType.d.ts.map +1 -1
  104. package/dist/providers/ProviderType.js +0 -1
  105. package/dist/providers/ProviderType.js.map +1 -1
  106. package/dist/providers/explorerHealthTest.d.ts +1 -1
  107. package/dist/providers/explorerHealthTest.d.ts.map +1 -1
  108. package/dist/providers/explorerHealthTest.js.map +1 -1
  109. package/dist/providers/providerBuilders.d.ts +1 -4
  110. package/dist/providers/providerBuilders.d.ts.map +1 -1
  111. package/dist/providers/providerBuilders.js +1 -12
  112. package/dist/providers/providerBuilders.js.map +1 -1
  113. package/dist/providers/transactions/submitter/builder/types.d.ts +344 -1
  114. package/dist/providers/transactions/submitter/builder/types.d.ts.map +1 -1
  115. package/dist/providers/transactions/submitter/builder/types.js +9 -1
  116. package/dist/providers/transactions/submitter/builder/types.js.map +1 -1
  117. package/dist/providers/transactions/submitter/ethersV5/types.d.ts +49 -1
  118. package/dist/providers/transactions/submitter/ethersV5/types.d.ts.map +1 -1
  119. package/dist/providers/transactions/submitter/ethersV5/types.js +19 -1
  120. package/dist/providers/transactions/submitter/ethersV5/types.js.map +1 -1
  121. package/dist/providers/transactions/submitter/ethersV5/types.test.d.ts +2 -0
  122. package/dist/providers/transactions/submitter/ethersV5/types.test.d.ts.map +1 -0
  123. package/dist/providers/transactions/submitter/ethersV5/{schemas.test.js → types.test.js} +2 -2
  124. package/dist/providers/transactions/submitter/ethersV5/types.test.js.map +1 -0
  125. package/dist/providers/transactions/submitter/types.d.ts +59 -1
  126. package/dist/providers/transactions/submitter/types.d.ts.map +1 -1
  127. package/dist/providers/transactions/submitter/types.js +21 -1
  128. package/dist/providers/transactions/submitter/types.js.map +1 -1
  129. package/dist/providers/transactions/transformer/ethersV5/types.d.ts +57 -1
  130. package/dist/providers/transactions/transformer/ethersV5/types.d.ts.map +1 -1
  131. package/dist/providers/transactions/transformer/ethersV5/types.js +6 -1
  132. package/dist/providers/transactions/transformer/ethersV5/types.js.map +1 -1
  133. package/dist/providers/transactions/transformer/ethersV5/types.test.d.ts +2 -0
  134. package/dist/providers/transactions/transformer/ethersV5/types.test.d.ts.map +1 -0
  135. package/dist/providers/transactions/transformer/ethersV5/{schemas.test.js → types.test.js} +2 -2
  136. package/dist/providers/transactions/transformer/ethersV5/types.test.js.map +1 -0
  137. package/dist/providers/transactions/transformer/types.d.ts +47 -1
  138. package/dist/providers/transactions/transformer/types.d.ts.map +1 -1
  139. package/dist/providers/transactions/transformer/types.js +9 -1
  140. package/dist/providers/transactions/transformer/types.js.map +1 -1
  141. package/dist/providers/transactions/types.d.ts +14 -1
  142. package/dist/providers/transactions/types.d.ts.map +1 -1
  143. package/dist/providers/transactions/types.js +8 -1
  144. package/dist/providers/transactions/types.js.map +1 -1
  145. package/dist/providers/transactions/types.test.d.ts +2 -0
  146. package/dist/providers/transactions/types.test.d.ts.map +1 -0
  147. package/dist/providers/transactions/{schemas.test.js → types.test.js} +2 -2
  148. package/dist/providers/transactions/types.test.js.map +1 -0
  149. package/dist/router/HyperlaneRouterChecker.d.ts.map +1 -1
  150. package/dist/router/HyperlaneRouterChecker.js +2 -3
  151. package/dist/router/HyperlaneRouterChecker.js.map +1 -1
  152. package/dist/router/HyperlaneRouterDeployer.d.ts.map +1 -1
  153. package/dist/router/HyperlaneRouterDeployer.js.map +1 -1
  154. package/dist/router/types.d.ts.map +1 -1
  155. package/dist/router/types.js +1 -1
  156. package/dist/router/types.js.map +1 -1
  157. package/dist/token/EvmERC20WarpModule.d.ts +18 -16
  158. package/dist/token/EvmERC20WarpModule.d.ts.map +1 -1
  159. package/dist/token/EvmERC20WarpModule.hardhat-test.js +43 -10
  160. package/dist/token/EvmERC20WarpModule.hardhat-test.js.map +1 -1
  161. package/dist/token/EvmERC20WarpModule.js +42 -29
  162. package/dist/token/EvmERC20WarpModule.js.map +1 -1
  163. package/dist/token/EvmERC20WarpRouteReader.d.ts +6 -7
  164. package/dist/token/EvmERC20WarpRouteReader.d.ts.map +1 -1
  165. package/dist/token/EvmERC20WarpRouteReader.js +1 -1
  166. package/dist/token/EvmERC20WarpRouteReader.js.map +1 -1
  167. package/dist/token/app.d.ts +2 -1
  168. package/dist/token/app.d.ts.map +1 -1
  169. package/dist/token/app.js +1 -1
  170. package/dist/token/app.js.map +1 -1
  171. package/dist/token/checker.d.ts +2 -2
  172. package/dist/token/checker.d.ts.map +1 -1
  173. package/dist/token/checker.js +15 -14
  174. package/dist/token/checker.js.map +1 -1
  175. package/dist/token/deploy.d.ts +9 -10
  176. package/dist/token/deploy.d.ts.map +1 -1
  177. package/dist/token/deploy.hardhat-test.js +1 -1
  178. package/dist/token/deploy.hardhat-test.js.map +1 -1
  179. package/dist/token/deploy.js +11 -12
  180. package/dist/token/deploy.js.map +1 -1
  181. package/dist/token/types.d.ts +1835 -2
  182. package/dist/token/types.d.ts.map +1 -1
  183. package/dist/token/types.js +106 -1
  184. package/dist/token/types.js.map +1 -1
  185. package/dist/token/types.test.d.ts +2 -0
  186. package/dist/token/types.test.d.ts.map +1 -0
  187. package/dist/token/{schemas.test.js → types.test.js} +3 -3
  188. package/dist/token/types.test.js.map +1 -0
  189. package/dist/types.d.ts +51 -0
  190. package/dist/types.d.ts.map +1 -1
  191. package/dist/types.js +15 -1
  192. package/dist/types.js.map +1 -1
  193. package/dist/utils/validator.d.ts +1 -0
  194. package/dist/utils/validator.d.ts.map +1 -1
  195. package/dist/utils/validator.js +4 -0
  196. package/dist/utils/validator.js.map +1 -1
  197. package/package.json +4 -6
  198. package/dist/core/schemas.d.ts +0 -5690
  199. package/dist/core/schemas.d.ts.map +0 -1
  200. package/dist/core/schemas.js +0 -30
  201. package/dist/core/schemas.js.map +0 -1
  202. package/dist/deploy/protocolDeploymentConfig.d.ts +0 -14
  203. package/dist/deploy/protocolDeploymentConfig.d.ts.map +0 -1
  204. package/dist/deploy/protocolDeploymentConfig.js +0 -37
  205. package/dist/deploy/protocolDeploymentConfig.js.map +0 -1
  206. package/dist/deploy/proxyFactoryUtils.d.ts +0 -7
  207. package/dist/deploy/proxyFactoryUtils.d.ts.map +0 -1
  208. package/dist/deploy/proxyFactoryUtils.js +0 -14
  209. package/dist/deploy/proxyFactoryUtils.js.map +0 -1
  210. package/dist/deploy/schemas.d.ts +0 -36
  211. package/dist/deploy/schemas.d.ts.map +0 -1
  212. package/dist/deploy/schemas.js +0 -15
  213. package/dist/deploy/schemas.js.map +0 -1
  214. package/dist/deploy/verify/BaseContractVerifier.d.ts +0 -23
  215. package/dist/deploy/verify/BaseContractVerifier.d.ts.map +0 -1
  216. package/dist/deploy/verify/BaseContractVerifier.js +0 -127
  217. package/dist/deploy/verify/BaseContractVerifier.js.map +0 -1
  218. package/dist/deploy/verify/ZKSyncContractVerifier.d.ts +0 -50
  219. package/dist/deploy/verify/ZKSyncContractVerifier.d.ts.map +0 -1
  220. package/dist/deploy/verify/ZKSyncContractVerifier.js +0 -98
  221. package/dist/deploy/verify/ZKSyncContractVerifier.js.map +0 -1
  222. package/dist/ica/schemas.d.ts +0 -107
  223. package/dist/ica/schemas.d.ts.map +0 -1
  224. package/dist/ica/schemas.js +0 -25
  225. package/dist/ica/schemas.js.map +0 -1
  226. package/dist/middleware/account/schemas.d.ts +0 -90
  227. package/dist/middleware/account/schemas.d.ts.map +0 -1
  228. package/dist/middleware/account/schemas.js +0 -19
  229. package/dist/middleware/account/schemas.js.map +0 -1
  230. package/dist/providers/transactions/schemas.d.ts +0 -16
  231. package/dist/providers/transactions/schemas.d.ts.map +0 -1
  232. package/dist/providers/transactions/schemas.js +0 -9
  233. package/dist/providers/transactions/schemas.js.map +0 -1
  234. package/dist/providers/transactions/schemas.test.d.ts +0 -2
  235. package/dist/providers/transactions/schemas.test.d.ts.map +0 -1
  236. package/dist/providers/transactions/schemas.test.js.map +0 -1
  237. package/dist/providers/transactions/submitter/builder/schemas.d.ts +0 -346
  238. package/dist/providers/transactions/submitter/builder/schemas.d.ts.map +0 -1
  239. package/dist/providers/transactions/submitter/builder/schemas.js +0 -10
  240. package/dist/providers/transactions/submitter/builder/schemas.js.map +0 -1
  241. package/dist/providers/transactions/submitter/ethersV5/schemas.d.ts +0 -51
  242. package/dist/providers/transactions/submitter/ethersV5/schemas.d.ts.map +0 -1
  243. package/dist/providers/transactions/submitter/ethersV5/schemas.js +0 -20
  244. package/dist/providers/transactions/submitter/ethersV5/schemas.js.map +0 -1
  245. package/dist/providers/transactions/submitter/ethersV5/schemas.test.d.ts +0 -2
  246. package/dist/providers/transactions/submitter/ethersV5/schemas.test.d.ts.map +0 -1
  247. package/dist/providers/transactions/submitter/ethersV5/schemas.test.js.map +0 -1
  248. package/dist/providers/transactions/submitter/schemas.d.ts +0 -61
  249. package/dist/providers/transactions/submitter/schemas.d.ts.map +0 -1
  250. package/dist/providers/transactions/submitter/schemas.js +0 -22
  251. package/dist/providers/transactions/submitter/schemas.js.map +0 -1
  252. package/dist/providers/transactions/transformer/ethersV5/schemas.d.ts +0 -58
  253. package/dist/providers/transactions/transformer/ethersV5/schemas.d.ts.map +0 -1
  254. package/dist/providers/transactions/transformer/ethersV5/schemas.js +0 -7
  255. package/dist/providers/transactions/transformer/ethersV5/schemas.js.map +0 -1
  256. package/dist/providers/transactions/transformer/ethersV5/schemas.test.d.ts +0 -2
  257. package/dist/providers/transactions/transformer/ethersV5/schemas.test.d.ts.map +0 -1
  258. package/dist/providers/transactions/transformer/ethersV5/schemas.test.js.map +0 -1
  259. package/dist/providers/transactions/transformer/schemas.d.ts +0 -49
  260. package/dist/providers/transactions/transformer/schemas.d.ts.map +0 -1
  261. package/dist/providers/transactions/transformer/schemas.js +0 -10
  262. package/dist/providers/transactions/transformer/schemas.js.map +0 -1
  263. package/dist/schemas.d.ts +0 -48
  264. package/dist/schemas.d.ts.map +0 -1
  265. package/dist/schemas.js +0 -16
  266. package/dist/schemas.js.map +0 -1
  267. package/dist/token/schemas.d.ts +0 -1835
  268. package/dist/token/schemas.d.ts.map +0 -1
  269. package/dist/token/schemas.js +0 -107
  270. package/dist/token/schemas.js.map +0 -1
  271. package/dist/token/schemas.test.d.ts +0 -2
  272. package/dist/token/schemas.test.d.ts.map +0 -1
  273. package/dist/token/schemas.test.js.map +0 -1
  274. package/dist/utils/zksync.d.ts +0 -8
  275. package/dist/utils/zksync.d.ts.map +0 -1
  276. package/dist/utils/zksync.js +0 -24
  277. package/dist/utils/zksync.js.map +0 -1
  278. package/dist/zksync/ZKSyncDeployer.d.ts +0 -53
  279. package/dist/zksync/ZKSyncDeployer.d.ts.map +0 -1
  280. package/dist/zksync/ZKSyncDeployer.js +0 -127
  281. package/dist/zksync/ZKSyncDeployer.js.map +0 -1
@@ -1,86 +1,79 @@
1
1
  import fetch from 'cross-fetch';
2
- import { buildArtifact as zksyncBuildArtifact } from '@hyperlane-xyz/core/buildArtifact-zksync.js';
2
+ import { ethers } from 'ethers';
3
3
  import { rootLogger, sleep, strip0x } from '@hyperlane-xyz/utils';
4
4
  import { ExplorerFamily } from '../../metadata/chainMetadataTypes.js';
5
- import { BaseContractVerifier } from './BaseContractVerifier.js';
6
5
  import { EXPLORER_GET_ACTIONS, ExplorerApiActions, ExplorerApiErrors, } from './types.js';
7
- export class ContractVerifier extends BaseContractVerifier {
6
+ export class ContractVerifier {
8
7
  multiProvider;
9
8
  apiKeys;
10
9
  logger = rootLogger.child({ module: 'ContractVerifier' });
10
+ contractSourceMap = {};
11
+ standardInputJson;
11
12
  compilerOptions;
12
13
  constructor(multiProvider, apiKeys, buildArtifact, licenseType) {
13
- super(multiProvider, buildArtifact);
14
14
  this.multiProvider = multiProvider;
15
15
  this.apiKeys = apiKeys;
16
+ this.standardInputJson = buildArtifact.input;
16
17
  const compilerversion = `v${buildArtifact.solcLongVersion}`;
18
+ // double check compiler version matches expected format
17
19
  const versionRegex = /v(\d.\d.\d+)\+commit.\w+/;
18
20
  const matches = versionRegex.exec(compilerversion);
19
21
  if (!matches) {
20
22
  throw new Error(`Invalid compiler version ${compilerversion}`);
21
23
  }
24
+ // set compiler options
25
+ // only license type is configurable, empty if not provided
22
26
  this.compilerOptions = {
23
27
  codeformat: 'solidity-standard-json-input',
24
28
  compilerversion,
25
29
  licenseType,
26
30
  };
27
- if (zksyncBuildArtifact?.zk_version)
28
- this.compilerOptions.zksolcversion = `v${zksyncBuildArtifact.zk_version}`;
29
- }
30
- async verify(chain, input, verificationLogger) {
31
- const contractType = input.isProxy ? 'proxy' : 'implementation';
32
- verificationLogger.debug(`📝 Verifying ${contractType}...`);
33
- const data = input.isProxy
34
- ? this.getProxyData(input)
35
- : this.getImplementationData(chain, input, verificationLogger);
36
- try {
37
- const guid = await this.submitForm(chain, input.isProxy
38
- ? ExplorerApiActions.VERIFY_PROXY
39
- : ExplorerApiActions.VERIFY_IMPLEMENTATION, verificationLogger, data);
40
- verificationLogger.trace({ guid }, `Retrieved guid from verified ${contractType}.`);
41
- await this.checkStatus(chain, input, verificationLogger, guid, contractType);
42
- const addressUrl = await this.multiProvider.tryGetExplorerAddressUrl(chain, input.address);
43
- verificationLogger.debug({
44
- addressUrl: addressUrl
45
- ? `${addressUrl}#code`
46
- : `Could not retrieve ${contractType} explorer URL.`,
47
- }, `✅ Successfully verified ${contractType}.`);
48
- }
49
- catch (error) {
50
- verificationLogger.debug({ error }, `Verification of ${contractType} failed`);
51
- throw error;
52
- }
53
- }
54
- async checkStatus(chain, input, verificationLogger, guid, contractType) {
55
- verificationLogger.trace({ guid }, `Checking ${contractType} status...`);
56
- await this.submitForm(chain, input.isProxy
57
- ? ExplorerApiActions.CHECK_PROXY_STATUS
58
- : ExplorerApiActions.CHECK_IMPLEMENTATION_STATUS, verificationLogger, {
59
- guid: guid,
31
+ // process input to create mapping of contract names to source names
32
+ // this is required to construct the fully qualified contract name
33
+ const contractRegex = /contract\s+([A-Z][a-zA-Z0-9]*)/g;
34
+ Object.entries(buildArtifact.input.sources).forEach(([sourceName, { content }]) => {
35
+ const matches = content.matchAll(contractRegex);
36
+ for (const match of matches) {
37
+ const contractName = match[1];
38
+ if (contractName) {
39
+ this.contractSourceMap[contractName] = sourceName;
40
+ }
41
+ }
60
42
  });
61
43
  }
62
- getProxyData(input) {
63
- return {
44
+ async verifyContract(chain, input, logger = this.logger) {
45
+ const verificationLogger = logger.child({
46
+ chain,
47
+ name: input.name,
64
48
  address: input.address,
65
- expectedimplementation: input.expectedimplementation,
66
- };
67
- }
68
- prepareImplementationData(sourceName, input, filteredStandardInputJson) {
69
- return {
70
- sourceCode: JSON.stringify(filteredStandardInputJson),
71
- contractname: `${sourceName}:${input.name}`,
72
- contractaddress: input.address,
73
- constructorArguements: strip0x(input.constructorArguments ?? ''),
74
- ...this.compilerOptions,
75
- };
49
+ });
50
+ const metadata = this.multiProvider.tryGetChainMetadata(chain);
51
+ const rpcUrl = metadata?.rpcUrls[0].http ?? '';
52
+ if (rpcUrl.includes('localhost') || rpcUrl.includes('127.0.0.1')) {
53
+ verificationLogger.debug('Skipping verification for local endpoints');
54
+ return;
55
+ }
56
+ const explorerApi = this.multiProvider.tryGetExplorerApi(chain);
57
+ if (!explorerApi) {
58
+ verificationLogger.debug('No explorer API set, skipping');
59
+ return;
60
+ }
61
+ if (!explorerApi.family) {
62
+ verificationLogger.debug(`No explorer family set, skipping`);
63
+ return;
64
+ }
65
+ if (explorerApi.family === ExplorerFamily.Other) {
66
+ verificationLogger.debug(`Unsupported explorer family, skipping`);
67
+ return;
68
+ }
69
+ if (input.address === ethers.constants.AddressZero)
70
+ return;
71
+ if (Array.isArray(input.constructorArguments)) {
72
+ verificationLogger.debug('Constructor arguments in legacy format, skipping');
73
+ return;
74
+ }
75
+ await this.verify(chain, input, verificationLogger);
76
76
  }
77
- /**
78
- * @notice Submits the verification form to the explorer API
79
- * @param chain The name of the chain where the contract is deployed
80
- * @param verificationLogger A logger instance for verification-specific logging
81
- * @param options Additional options for the API request
82
- * @returns The response from the explorer API
83
- */
84
77
  async submitForm(chain, action, verificationLogger, options) {
85
78
  const { apiUrl, family, apiKey = this.apiKeys[chain], } = this.multiProvider.getExplorerApi(chain);
86
79
  const params = new URLSearchParams();
@@ -182,5 +175,126 @@ export class ContractVerifier extends BaseContractVerifier {
182
175
  await sleep(timeout);
183
176
  return responseJson.result;
184
177
  }
178
+ async verify(chain, input, verificationLogger) {
179
+ const contractType = input.isProxy ? 'proxy' : 'implementation';
180
+ verificationLogger.debug(`📝 Verifying ${contractType}...`);
181
+ const data = input.isProxy
182
+ ? this.getProxyData(input)
183
+ : this.getImplementationData(chain, input, verificationLogger);
184
+ try {
185
+ const guid = await this.submitForm(chain, input.isProxy
186
+ ? ExplorerApiActions.VERIFY_PROXY
187
+ : ExplorerApiActions.VERIFY_IMPLEMENTATION, verificationLogger, data);
188
+ verificationLogger.trace({ guid }, `Retrieved guid from verified ${contractType}.`);
189
+ await this.checkStatus(chain, input, verificationLogger, guid, contractType);
190
+ const addressUrl = await this.multiProvider.tryGetExplorerAddressUrl(chain, input.address);
191
+ verificationLogger.debug({
192
+ addressUrl: addressUrl
193
+ ? `${addressUrl}#code`
194
+ : `Could not retrieve ${contractType} explorer URL.`,
195
+ }, `✅ Successfully verified ${contractType}.`);
196
+ }
197
+ catch (error) {
198
+ verificationLogger.debug({ error }, `Verification of ${contractType} failed`);
199
+ throw error;
200
+ }
201
+ }
202
+ async checkStatus(chain, input, verificationLogger, guid, contractType) {
203
+ verificationLogger.trace({ guid }, `Checking ${contractType} status...`);
204
+ await this.submitForm(chain, input.isProxy
205
+ ? ExplorerApiActions.CHECK_PROXY_STATUS
206
+ : ExplorerApiActions.CHECK_IMPLEMENTATION_STATUS, verificationLogger, {
207
+ guid: guid,
208
+ });
209
+ }
210
+ getProxyData(input) {
211
+ return {
212
+ address: input.address,
213
+ expectedimplementation: input.expectedimplementation,
214
+ };
215
+ }
216
+ getImplementationData(chain, input, verificationLogger) {
217
+ const sourceName = this.contractSourceMap[input.name];
218
+ if (!sourceName) {
219
+ const errorMessage = `Contract '${input.name}' not found in provided build artifact`;
220
+ verificationLogger.error(errorMessage);
221
+ throw new Error(`[${chain}] ${errorMessage}`);
222
+ }
223
+ const filteredStandardInputJson = this.filterStandardInputJsonByContractName(input.name, this.standardInputJson, verificationLogger);
224
+ return {
225
+ sourceCode: JSON.stringify(filteredStandardInputJson),
226
+ contractname: `${sourceName}:${input.name}`,
227
+ contractaddress: input.address,
228
+ /* TYPO IS ENFORCED BY API */
229
+ constructorArguements: strip0x(input.constructorArguments ?? ''),
230
+ ...this.compilerOptions,
231
+ };
232
+ }
233
+ /**
234
+ * Filters the solidity standard input for a specific contract name.
235
+ *
236
+ * This is a BFS impl to traverse the source input dependency graph.
237
+ * 1. Named contract file is set as root node.
238
+ * 2. The next level is formed by the direct imports of the contract file.
239
+ * 3. Each subsequent level's dependencies form the next level, etc.
240
+ * 4. The queue tracks the next files to process, and ensures the dependency graph explorered level by level.
241
+ */
242
+ filterStandardInputJsonByContractName(contractName, input, verificationLogger) {
243
+ verificationLogger.trace({ contractName }, 'Filtering unused contracts from solidity standard input JSON....');
244
+ const filteredSources = {};
245
+ const sourceFiles = Object.keys(input.sources);
246
+ const contractFile = this.getContractFile(contractName, sourceFiles);
247
+ const queue = [contractFile];
248
+ const processed = new Set();
249
+ while (queue.length > 0) {
250
+ const file = queue.shift();
251
+ if (processed.has(file))
252
+ continue;
253
+ processed.add(file);
254
+ filteredSources[file] = input.sources[file];
255
+ const content = input.sources[file].content;
256
+ const importStatements = this.getAllImportStatements(content);
257
+ importStatements.forEach((importStatement) => {
258
+ const importPath = importStatement.match(/["']([^"']+)["']/)?.[1];
259
+ if (importPath) {
260
+ const resolvedPath = this.resolveImportPath(file, importPath);
261
+ if (sourceFiles.includes(resolvedPath))
262
+ queue.push(resolvedPath);
263
+ }
264
+ });
265
+ }
266
+ return {
267
+ ...input,
268
+ sources: filteredSources,
269
+ };
270
+ }
271
+ getContractFile(contractName, sourceFiles) {
272
+ const contractFile = sourceFiles.find((file) => file.endsWith(`/${contractName}.sol`));
273
+ if (!contractFile) {
274
+ throw new Error(`Contract ${contractName} not found in sources.`);
275
+ }
276
+ return contractFile;
277
+ }
278
+ getAllImportStatements(content) {
279
+ const importRegex = /import\s+(?:(?:(?:"[^"]+"|'[^']+')\s*;)|(?:{[^}]+}\s+from\s+(?:"[^"]+"|'[^']+')\s*;)|(?:\s*(?:"[^"]+"|'[^']+')\s*;))/g;
280
+ return content.match(importRegex) || [];
281
+ }
282
+ resolveImportPath(currentFile, importPath) {
283
+ /* Use as-is for external dependencies and absolute imports */
284
+ if (importPath.startsWith('@') || importPath.startsWith('http')) {
285
+ return importPath;
286
+ }
287
+ const currentDir = currentFile.split('/').slice(0, -1).join('/');
288
+ const resolvedPath = importPath.split('/').reduce((acc, part) => {
289
+ if (part === '..') {
290
+ acc.pop();
291
+ }
292
+ else if (part !== '.') {
293
+ acc.push(part);
294
+ }
295
+ return acc;
296
+ }, currentDir.split('/'));
297
+ return resolvedPath.join('/');
298
+ }
185
299
  }
186
300
  //# sourceMappingURL=ContractVerifier.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ContractVerifier.js","sourceRoot":"","sources":["../../../src/deploy/verify/ContractVerifier.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ContractVerifier.js","sourceRoot":"","sources":["../../../src/deploy/verify/ContractVerifier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAElE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAItE,OAAO,EAIL,oBAAoB,EACpB,kBAAkB,EAClB,iBAAiB,GAGlB,MAAM,YAAY,CAAC;AAEpB,MAAM,OAAO,gBAAgB;IASN;IACA;IATX,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAE1D,iBAAiB,GAAuC,EAAE,CAAC;IAElD,iBAAiB,CAA4B;IAC7C,eAAe,CAAkB;IAEpD,YACqB,aAA4B,EAC5B,OAAyB,EAC5C,aAA4B,EAC5B,WAA2C;QAHxB,kBAAa,GAAb,aAAa,CAAe;QAC5B,YAAO,GAAP,OAAO,CAAkB;QAI5C,IAAI,CAAC,iBAAiB,GAAG,aAAa,CAAC,KAAK,CAAC;QAE7C,MAAM,eAAe,GAAG,IAAI,aAAa,CAAC,eAAe,EAAE,CAAC;QAE5D,wDAAwD;QACxD,MAAM,YAAY,GAAG,0BAA0B,CAAC;QAChD,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACnD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,4BAA4B,eAAe,EAAE,CAAC,CAAC;QACjE,CAAC;QAED,uBAAuB;QACvB,2DAA2D;QAC3D,IAAI,CAAC,eAAe,GAAG;YACrB,UAAU,EAAE,8BAA8B;YAC1C,eAAe;YACf,WAAW;SACZ,CAAC;QAEF,oEAAoE;QACpE,kEAAkE;QAClE,MAAM,aAAa,GAAG,iCAAiC,CAAC;QACxD,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,CACjD,CAAC,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE;YAC5B,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YAChD,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC5B,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC9B,IAAI,YAAY,EAAE,CAAC;oBACjB,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC;gBACpD,CAAC;YACH,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,cAAc,CACzB,KAAgB,EAChB,KAAgC,EAChC,MAAM,GAAG,IAAI,CAAC,MAAM;QAEpB,MAAM,kBAAkB,GAAG,MAAM,CAAC,KAAK,CAAC;YACtC,KAAK;YACL,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAC/D,MAAM,MAAM,GAAG,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;QAC/C,IAAI,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YACjE,kBAAkB,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;YACtE,OAAO;QACT,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAChE,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,kBAAkB,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;YAC1D,OAAO;QACT,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;YACxB,kBAAkB,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;YAC7D,OAAO;QACT,CAAC;QAED,IAAI,WAAW,CAAC,MAAM,KAAK,cAAc,CAAC,KAAK,EAAE,CAAC;YAChD,kBAAkB,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;YAClE,OAAO;QACT,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,KAAK,MAAM,CAAC,SAAS,CAAC,WAAW;YAAE,OAAO;QAC3D,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE,CAAC;YAC9C,kBAAkB,CAAC,KAAK,CACtB,kDAAkD,CACnD,CAAC;YACF,OAAO;QACT,CAAC;QAED,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,kBAAkB,CAAC,CAAC;IACtD,CAAC;IAEO,KAAK,CAAC,UAAU,CACtB,KAAgB,EAChB,MAA0B,EAC1B,kBAA0B,EAC1B,OAAoC;QAEpC,MAAM,EACJ,MAAM,EACN,MAAM,EACN,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAC7B,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;QAErC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QACjC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC7B,IAAI,MAAM;YAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAEzC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;YACzD,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACzB,CAAC;QAED,IAAI,OAAO,GAAW,IAAI,CAAC;QAC3B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;QAC5B,MAAM,YAAY,GAAG,oBAAoB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC3D,IAAI,YAAY;YAAE,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAEjD,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,cAAc,CAAC,SAAS;gBAC3B,OAAO,GAAG,IAAI,CAAC;gBACf,MAAM;YACR,KAAK,cAAc,CAAC,UAAU;gBAC5B,OAAO,GAAG,IAAI,CAAC;gBACf,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;gBAC3C,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gBACvC,MAAM;YACR,KAAK,cAAc,CAAC,SAAS;gBAC3B,OAAO,GAAG,GAAG,CAAC;gBACd,MAAM;YACR,KAAK,cAAc,CAAC,KAAK,CAAC;YAC1B;gBACE,MAAM,IAAI,KAAK,CACb,gCAAgC,MAAM,KAAK,KAAK,KAAK,MAAM,EAAE,CAC9D,CAAC;QACN,CAAC;QAED,kBAAkB,CAAC,KAAK,CACtB,EAAE,MAAM,EAAE,KAAK,EAAE,EACjB,gCAAgC,CACjC,CAAC;QACF,IAAI,QAAkB,CAAC;QACvB,IAAI,YAAY,EAAE,CAAC;YACjB,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE;gBACrC,MAAM,EAAE,KAAK;aACd,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,GAAgB;gBACxB,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,EAAE,cAAc,EAAE,mCAAmC,EAAE;gBAChE,IAAI,EAAE,MAAM;aACb,CAAC;YACF,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;QAC/C,CAAC;QACD,IAAI,YAAY,CAAC;QACjB,IAAI,CAAC;YACH,MAAM,kBAAkB,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACjD,kBAAkB,CAAC,KAAK,CACtB,EAAE,MAAM,EAAE,KAAK,EAAE,EACjB,mCAAmC,CACpC,CAAC;YACF,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAChD,CAAC;QAAC,MAAM,CAAC;YACP,kBAAkB,CAAC,KAAK,CACtB;gBACE,OAAO,EAAE,QAAQ,CAAC,UAAU;gBAC5B,MAAM,EAAE,QAAQ,CAAC,MAAM;gBACvB,KAAK;gBACL,MAAM;gBACN,MAAM;aACP,EACD,yCAAyC,CAC1C,CAAC;YACF,MAAM,IAAI,KAAK,CACb,2CAA2C,MAAM,KAAK,KAAK,MACzD,QAAQ,CAAC,UAAU,IAAI,qBACzB,KAAK,QAAQ,CAAC,MAAM,IAAI,gBAAgB,GAAG,CAC5C,CAAC;QACJ,CAAC;QAED,IAAI,YAAY,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YAClC,IAAI,YAAY,CAAC;YAEjB,QAAQ,YAAY,CAAC,MAAM,EAAE,CAAC;gBAC5B,KAAK,iBAAiB,CAAC,oBAAoB;oBACzC,kBAAkB,CAAC,KAAK,CACtB;wBACE,MAAM,EAAE,YAAY,CAAC,MAAM;qBAC5B,EACD,4BAA4B,CAC7B,CAAC;oBACF,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC;oBACrB,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;gBACrE,KAAK,iBAAiB,CAAC,gBAAgB,CAAC;gBACxC,KAAK,iBAAiB,CAAC,oBAAoB;oBACzC,MAAM;gBACR,KAAK,iBAAiB,CAAC,YAAY,CAAC;gBACpC,KAAK,iBAAiB,CAAC,YAAY,CAAC;gBACpC,KAAK,iBAAiB,CAAC,iBAAiB;oBACtC,YAAY,GAAG,GAAG,YAAY,CAAC,OAAO,KAAK,YAAY,CAAC,MAAM,EAAE,CAAC;oBACjE,MAAM;gBACR;oBACE,YAAY,GAAG,wBACb,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,UAClD,EAAE,CAAC;oBACH,MAAM;YACV,CAAC;YAED,IAAI,YAAY,EAAE,CAAC;gBACjB,kBAAkB,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gBACvC,MAAM,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,YAAY,EAAE,CAAC,CAAC;YAChD,CAAC;QACH,CAAC;QAED,IAAI,YAAY,CAAC,MAAM,KAAK,iBAAiB,CAAC,WAAW,EAAE,CAAC;YAC1D,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC;YACrB,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;QACrE,CAAC;QAED,IAAI,YAAY,CAAC,MAAM,KAAK,iBAAiB,CAAC,gBAAgB,EAAE,CAAC;YAC/D,MAAM,YAAY,GAAG,wBACnB,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,UAClD,EAAE,CAAC;YACH,kBAAkB,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,YAAY,EAAE,CAAC,CAAC;QAChD,CAAC;QAED,kBAAkB,CAAC,KAAK,CACtB,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,CAAC,MAAM,EAAE,EAC9C,iCAAiC,CAClC,CAAC;QAEF,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC;QACrB,OAAO,YAAY,CAAC,MAAM,CAAC;IAC7B,CAAC;IAEO,KAAK,CAAC,MAAM,CAClB,KAAgB,EAChB,KAAgC,EAChC,kBAA0B;QAE1B,MAAM,YAAY,GAAW,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAgB,CAAC;QAExE,kBAAkB,CAAC,KAAK,CAAC,gBAAgB,YAAY,KAAK,CAAC,CAAC;QAE5D,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO;YACxB,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;YAC1B,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,KAAK,EAAE,kBAAkB,CAAC,CAAC;QAEjE,IAAI,CAAC;YACH,MAAM,IAAI,GAAW,MAAM,IAAI,CAAC,UAAU,CACxC,KAAK,EACL,KAAK,CAAC,OAAO;gBACX,CAAC,CAAC,kBAAkB,CAAC,YAAY;gBACjC,CAAC,CAAC,kBAAkB,CAAC,qBAAqB,EAC5C,kBAAkB,EAClB,IAAI,CACL,CAAC;YAEF,kBAAkB,CAAC,KAAK,CACtB,EAAE,IAAI,EAAE,EACR,gCAAgC,YAAY,GAAG,CAChD,CAAC;YAEF,MAAM,IAAI,CAAC,WAAW,CACpB,KAAK,EACL,KAAK,EACL,kBAAkB,EAClB,IAAI,EACJ,YAAY,CACb,CAAC;YAEF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,wBAAwB,CAClE,KAAK,EACL,KAAK,CAAC,OAAO,CACd,CAAC;YAEF,kBAAkB,CAAC,KAAK,CACtB;gBACE,UAAU,EAAE,UAAU;oBACpB,CAAC,CAAC,GAAG,UAAU,OAAO;oBACtB,CAAC,CAAC,sBAAsB,YAAY,gBAAgB;aACvD,EACD,2BAA2B,YAAY,GAAG,CAC3C,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,kBAAkB,CAAC,KAAK,CACtB,EAAE,KAAK,EAAE,EACT,mBAAmB,YAAY,SAAS,CACzC,CAAC;YACF,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,WAAW,CACvB,KAAgB,EAChB,KAAgC,EAChC,kBAA0B,EAC1B,IAAY,EACZ,YAAoB;QAEpB,kBAAkB,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,EAAE,YAAY,YAAY,YAAY,CAAC,CAAC;QACzE,MAAM,IAAI,CAAC,UAAU,CACnB,KAAK,EACL,KAAK,CAAC,OAAO;YACX,CAAC,CAAC,kBAAkB,CAAC,kBAAkB;YACvC,CAAC,CAAC,kBAAkB,CAAC,2BAA2B,EAClD,kBAAkB,EAClB;YACE,IAAI,EAAE,IAAI;SACX,CACF,CAAC;IACJ,CAAC;IAEO,YAAY,CAAC,KAAgC;QACnD,OAAO;YACL,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,sBAAsB,EAAE,KAAK,CAAC,sBAAsB;SACrD,CAAC;IACJ,CAAC;IAEO,qBAAqB,CAC3B,KAAgB,EAChB,KAAgC,EAChC,kBAA0B;QAE1B,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,YAAY,GAAG,aAAa,KAAK,CAAC,IAAI,wCAAwC,CAAC;YACrF,kBAAkB,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,YAAY,EAAE,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,yBAAyB,GAC7B,IAAI,CAAC,qCAAqC,CACxC,KAAK,CAAC,IAAI,EACV,IAAI,CAAC,iBAAiB,EACtB,kBAAkB,CACnB,CAAC;QAEJ,OAAO;YACL,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,yBAAyB,CAAC;YACrD,YAAY,EAAE,GAAG,UAAU,IAAI,KAAK,CAAC,IAAI,EAAE;YAC3C,eAAe,EAAE,KAAK,CAAC,OAAO;YAC9B,6BAA6B;YAC7B,qBAAqB,EAAE,OAAO,CAAC,KAAK,CAAC,oBAAoB,IAAI,EAAE,CAAC;YAChE,GAAG,IAAI,CAAC,eAAe;SACxB,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACK,qCAAqC,CAC3C,YAAoB,EACpB,KAAgC,EAChC,kBAA0B;QAE1B,kBAAkB,CAAC,KAAK,CACtB,EAAE,YAAY,EAAE,EAChB,kEAAkE,CACnE,CAAC;QACF,MAAM,eAAe,GAAyC,EAAE,CAAC;QACjE,MAAM,WAAW,GAAa,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACzD,MAAM,YAAY,GAAW,IAAI,CAAC,eAAe,CAC/C,YAAY,EACZ,WAAW,CACZ,CAAC;QACF,MAAM,KAAK,GAAa,CAAC,YAAY,CAAC,CAAC;QACvC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;QAEpC,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,EAAG,CAAC;YAC5B,IAAI,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,SAAS;YAClC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAEpB,eAAe,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAE5C,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YAC5C,MAAM,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;YAE9D,gBAAgB,CAAC,OAAO,CAAC,CAAC,eAAe,EAAE,EAAE;gBAC3C,MAAM,UAAU,GAAG,eAAe,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBAClE,IAAI,UAAU,EAAE,CAAC;oBACf,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;oBAC9D,IAAI,WAAW,CAAC,QAAQ,CAAC,YAAY,CAAC;wBAAE,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBACnE,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,OAAO;YACL,GAAG,KAAK;YACR,OAAO,EAAE,eAAe;SACzB,CAAC;IACJ,CAAC;IAEO,eAAe,CAAC,YAAoB,EAAE,WAAqB;QACjE,MAAM,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAC7C,IAAI,CAAC,QAAQ,CAAC,IAAI,YAAY,MAAM,CAAC,CACtC,CAAC;QACF,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,YAAY,YAAY,wBAAwB,CAAC,CAAC;QACpE,CAAC;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;IAEO,sBAAsB,CAAC,OAAe;QAC5C,MAAM,WAAW,GACf,uHAAuH,CAAC;QAC1H,OAAO,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IAC1C,CAAC;IAEO,iBAAiB,CAAC,WAAmB,EAAE,UAAkB;QAC/D,8DAA8D;QAC9D,IAAI,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAChE,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjE,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YAC9D,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBAClB,GAAG,CAAC,GAAG,EAAE,CAAC;YACZ,CAAC;iBAAM,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;gBACxB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjB,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1B,OAAO,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;CACF"}
@@ -24,7 +24,6 @@ export type SolidityStandardJsonInput = {
24
24
  export type BuildArtifact = {
25
25
  input: SolidityStandardJsonInput;
26
26
  solcLongVersion: string;
27
- zk_version?: string;
28
27
  };
29
28
  export declare enum ExplorerLicenseType {
30
29
  NO_LICENSE = "1",
@@ -46,13 +45,6 @@ export type CompilerOptions = {
46
45
  codeformat: 'solidity-standard-json-input';
47
46
  compilerversion: string;
48
47
  licenseType?: ExplorerLicenseType;
49
- zksolcversion?: string;
50
- };
51
- export type ZKSyncCompilerOptions = {
52
- codeFormat: 'solidity-standard-json-input';
53
- compilerSolcVersion: string;
54
- compilerZksolcVersion: string;
55
- optimizationUsed: boolean;
56
48
  };
57
49
  export declare enum ExplorerApiActions {
58
50
  GETSOURCECODE = "getsourcecode",
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/deploy/verify/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/deploy/verify/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,yBAAyB,EAAE,CAAC;AAE5D,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,EAAE;QACP,CAAC,UAAU,EAAE,MAAM,GAAG;YACpB,OAAO,EAAE,MAAM,CAAC;SACjB,CAAC;KACH,CAAC;IACF,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE;QACR,SAAS,EAAE;YACT,OAAO,EAAE,OAAO,CAAC;YACjB,IAAI,EAAE,MAAM,CAAC;SACd,CAAC;QACF,eAAe,EAAE,GAAG,CAAC;KACtB,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,yBAAyB,CAAC;IACjC,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAGF,oBAAY,mBAAmB;IAC7B,UAAU,MAAM;IAChB,UAAU,MAAM;IAChB,GAAG,MAAM;IACT,IAAI,MAAM;IACV,IAAI,MAAM;IACV,KAAK,MAAM;IACX,KAAK,MAAM;IACX,IAAI,MAAM;IACV,IAAI,MAAM;IACV,IAAI,OAAO;IACX,IAAI,OAAO;IACX,OAAO,OAAO;IACd,KAAK,OAAO;IACZ,GAAG,OAAO;CACX;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,EAAE,8BAA8B,CAAC;IAC3C,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,mBAAmB,CAAC;CACnC,CAAC;AAEF,oBAAY,kBAAkB;IAC5B,aAAa,kBAAkB;IAC/B,qBAAqB,qBAAqB;IAC1C,YAAY,wBAAwB;IACpC,2BAA2B,sBAAsB;IACjD,kBAAkB,2BAA2B;CAC9C;AAED,eAAO,MAAM,oBAAoB,sBAIhC,CAAC;AAEF,oBAAY,iBAAiB;IAC3B,gBAAgB,0CAA0C;IAC1D,oBAAoB,qBAAqB;IACzC,YAAY,sCAAsC;IAClD,oBAAoB,qBAAqB;IACzC,YAAY,kGAAkG;IAC9G,iBAAiB,uHAAuH;IACxI,gBAAgB,4BAA4B;IAC5C,WAAW,gBAAgB;CAC5B;AAED,MAAM,MAAM,WAAW,CAAC,MAAM,SAAS,kBAAkB,IACvD,MAAM,SAAS,kBAAkB,CAAC,aAAa,GAC3C;IACE,OAAO,EAAE,MAAM,CAAC;CACjB,GACD,MAAM,SAAS,kBAAkB,CAAC,qBAAqB,GACvD,eAAe,GAAG;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IAErB,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,GACD,MAAM,SAAS,kBAAkB,CAAC,YAAY,GAC9C;IACE,OAAO,EAAE,MAAM,CAAC;IAChB,sBAAsB,EAAE,MAAM,CAAC;CAChC,GACD,MAAM,SAAS,kBAAkB,CAAC,2BAA2B,GAC7D;IACE,IAAI,EAAE,MAAM,CAAC;CACd,GACD,MAAM,SAAS,kBAAkB,CAAC,kBAAkB,GACpD;IACE,IAAI,EAAE,MAAM,CAAC;CACd,GACD,KAAK,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/deploy/verify/types.ts"],"names":[],"mappings":"AAgCA,kDAAkD;AAClD,MAAM,CAAN,IAAY,mBAeX;AAfD,WAAY,mBAAmB;IAC7B,uCAAgB,CAAA;IAChB,uCAAgB,CAAA;IAChB,gCAAS,CAAA;IACT,iCAAU,CAAA;IACV,iCAAU,CAAA;IACV,kCAAW,CAAA;IACX,kCAAW,CAAA;IACX,iCAAU,CAAA;IACV,iCAAU,CAAA;IACV,kCAAW,CAAA;IACX,kCAAW,CAAA;IACX,qCAAc,CAAA;IACd,mCAAY,CAAA;IACZ,iCAAU,CAAA;AACZ,CAAC,EAfW,mBAAmB,KAAnB,mBAAmB,QAe9B;AAgBD,MAAM,CAAN,IAAY,kBAMX;AAND,WAAY,kBAAkB;IAC5B,qDAA+B,CAAA;IAC/B,gEAA0C,CAAA;IAC1C,0DAAoC,CAAA;IACpC,uEAAiD,CAAA;IACjD,mEAA6C,CAAA;AAC/C,CAAC,EANW,kBAAkB,KAAlB,kBAAkB,QAM7B;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,kBAAkB,CAAC,2BAA2B;IAC9C,kBAAkB,CAAC,kBAAkB;IACrC,kBAAkB,CAAC,aAAa;CACjC,CAAC;AAEF,MAAM,CAAN,IAAY,iBASX;AATD,WAAY,iBAAiB;IAC3B,+EAA0D,CAAA;IAC1D,8DAAyC,CAAA;IACzC,uEAAkD,CAAA;IAClD,8DAAyC,CAAA;IACzC,mIAA8G,CAAA;IAC9G,6JAAwI,CAAA;IACxI,iEAA4C,CAAA;IAC5C,gDAA2B,CAAA;AAC7B,CAAC,EATW,iBAAiB,KAAjB,iBAAiB,QAS5B"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/deploy/verify/types.ts"],"names":[],"mappings":"AA+BA,kDAAkD;AAClD,MAAM,CAAN,IAAY,mBAeX;AAfD,WAAY,mBAAmB;IAC7B,uCAAgB,CAAA;IAChB,uCAAgB,CAAA;IAChB,gCAAS,CAAA;IACT,iCAAU,CAAA;IACV,iCAAU,CAAA;IACV,kCAAW,CAAA;IACX,kCAAW,CAAA;IACX,iCAAU,CAAA;IACV,iCAAU,CAAA;IACV,kCAAW,CAAA;IACX,kCAAW,CAAA;IACX,qCAAc,CAAA;IACd,mCAAY,CAAA;IACZ,iCAAU,CAAA;AACZ,CAAC,EAfW,mBAAmB,KAAnB,mBAAmB,QAe9B;AAQD,MAAM,CAAN,IAAY,kBAMX;AAND,WAAY,kBAAkB;IAC5B,qDAA+B,CAAA;IAC/B,gEAA0C,CAAA;IAC1C,0DAAoC,CAAA;IACpC,uEAAiD,CAAA;IACjD,mEAA6C,CAAA;AAC/C,CAAC,EANW,kBAAkB,KAAlB,kBAAkB,QAM7B;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,kBAAkB,CAAC,2BAA2B;IAC9C,kBAAkB,CAAC,kBAAkB;IACrC,kBAAkB,CAAC,aAAa;CACjC,CAAC;AAEF,MAAM,CAAN,IAAY,iBASX;AATD,WAAY,iBAAiB;IAC3B,+EAA0D,CAAA;IAC1D,8DAAyC,CAAA;IACzC,uEAAkD,CAAA;IAClD,8DAAyC,CAAA;IACzC,mIAA8G,CAAA;IAC9G,6JAAwI,CAAA;IACxI,iEAA4C,CAAA;IAC5C,gDAA2B,CAAA;AAC7B,CAAC,EATW,iBAAiB,KAAjB,iBAAiB,QAS5B"}
@@ -1,5 +1,4 @@
1
1
  import { ethers, utils } from 'ethers';
2
- import { ZKSyncArtifact } from '@hyperlane-xyz/core';
3
2
  import { Address } from '@hyperlane-xyz/utils';
4
3
  import { MultiProvider } from '../../providers/MultiProvider.js';
5
4
  import { ChainMap, ChainName } from '../../types.js';
@@ -14,15 +13,6 @@ export declare function getContractVerificationInput({ name, contract, bytecode,
14
13
  isProxy?: boolean;
15
14
  expectedimplementation?: Address;
16
15
  }): ContractVerificationInput;
17
- export declare function getContractVerificationInputForZKSync({ name, contract, constructorArgs, artifact, isProxy, expectedimplementation, }: {
18
- name: string;
19
- contract: ethers.Contract;
20
- constructorArgs: any[];
21
- artifact: ZKSyncArtifact;
22
- isProxy?: boolean;
23
- expectedimplementation?: Address;
24
- }): Promise<ContractVerificationInput>;
25
- export declare function encodeArguments(abi: any, constructorArgs: any[]): string;
26
16
  /**
27
17
  * Check if the artifact should be added to the verification inputs.
28
18
  * @param verificationInputs - The verification inputs for the chain.
@@ -32,13 +22,7 @@ export declare function encodeArguments(abi: any, constructorArgs: any[]): strin
32
22
  */
33
23
  export declare function shouldAddVerificationInput(verificationInputs: ChainMap<ContractVerificationInput[]>, chain: ChainName, artifact: ContractVerificationInput): boolean;
34
24
  /**
35
- * @notice Defines verification delay times for different blockchain explorer families.
36
- * @dev This constant object associates explorer families with specific delay times (in milliseconds)
37
- */
38
- export declare const FamilyVerificationDelay: {
39
- readonly etherscan: 40000;
40
- };
41
- /** Retrieves the constructor args using their respective Explorer and/or RPC (eth_getTransactionByHash)
25
+ * Retrieves the constructor args using their respective Explorer and/or RPC (eth_getTransactionByHash)
42
26
  */
43
27
  export declare function getConstructorArgumentsApi({ chainName, contractAddress, bytecode, multiProvider, }: {
44
28
  bytecode: string;
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/deploy/verify/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/deploy/verify/utils.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,3 @@
1
- import { utils } from 'ethers';
2
1
  import { ProxyAdmin__factory, TransparentUpgradeableProxy__factory, } from '@hyperlane-xyz/core';
3
2
  import { assert, eqAddress } from '@hyperlane-xyz/utils';
4
3
  import { ExplorerFamily } from '../../metadata/chainMetadataTypes.js';
@@ -26,23 +25,6 @@ export function getContractVerificationInput({ name, contract, bytecode, isProxy
26
25
  const args = getConstructorArguments(contract, bytecode);
27
26
  return buildVerificationInput(name, contract.address, args, isProxy, expectedimplementation);
28
27
  }
29
- export async function getContractVerificationInputForZKSync({ name, contract, constructorArgs, artifact, isProxy, expectedimplementation, }) {
30
- const args = encodeArguments(artifact.abi, constructorArgs);
31
- return buildVerificationInput(name, contract.address, args, isProxy, expectedimplementation);
32
- }
33
- export function encodeArguments(abi, constructorArgs) {
34
- const contractInterface = new utils.Interface(abi);
35
- let deployArgumentsEncoded;
36
- try {
37
- deployArgumentsEncoded = contractInterface
38
- .encodeDeploy(constructorArgs)
39
- .replace('0x', '');
40
- }
41
- catch (error) {
42
- throw new Error('Cant encode constructor args');
43
- }
44
- return deployArgumentsEncoded;
45
- }
46
28
  /**
47
29
  * Check if the artifact should be added to the verification inputs.
48
30
  * @param verificationInputs - The verification inputs for the chain.
@@ -57,13 +39,7 @@ export function shouldAddVerificationInput(verificationInputs, chain, artifact)
57
39
  existingArtifact.isProxy === artifact.isProxy);
58
40
  }
59
41
  /**
60
- * @notice Defines verification delay times for different blockchain explorer families.
61
- * @dev This constant object associates explorer families with specific delay times (in milliseconds)
62
- */
63
- export const FamilyVerificationDelay = {
64
- [ExplorerFamily.Etherscan]: 40000,
65
- };
66
- /** Retrieves the constructor args using their respective Explorer and/or RPC (eth_getTransactionByHash)
42
+ * Retrieves the constructor args using their respective Explorer and/or RPC (eth_getTransactionByHash)
67
43
  */
68
44
  export async function getConstructorArgumentsApi({ chainName, contractAddress, bytecode, multiProvider, }) {
69
45
  const { family } = multiProvider.getExplorerApi(chainName);
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/deploy/verify/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/deploy/verify/utils.ts"],"names":[],"mappings":"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"}
@@ -12,12 +12,16 @@ export interface StorageConfig {
12
12
  }
13
13
  export declare class GcpStorageWrapper {
14
14
  readonly config: StorageConfig;
15
- private readonly client;
16
15
  private readonly bucket;
17
16
  private cache;
17
+ private readonly baseUrl;
18
18
  static fromBucketUrl(bucketUrl: string): GcpStorageWrapper;
19
19
  constructor(config: StorageConfig);
20
- formatKey(key: string): string;
20
+ private formatKey;
21
+ private getCachedObject;
22
+ private setCachedObject;
23
+ private fetchMetadata;
24
+ private fetchContent;
21
25
  getObject<T>(key: string): Promise<StorageReceipt<T> | undefined>;
22
26
  url(key: string): string;
23
27
  }
@@ -1 +1 @@
1
- {"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/gcp/storage.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,gBAAgB,QACgD,CAAC;AAE9E,MAAM,WAAW,cAAc,CAAC,CAAC,GAAG,OAAO;IACzC,IAAI,EAAE,CAAC,CAAC;IACR,QAAQ,EAAE,IAAI,CAAC;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,iBAAiB;IAchB,QAAQ,CAAC,MAAM,EAAE,aAAa;IAb1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,KAAK,CAAkD;IAE/D,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,iBAAiB;gBASrC,MAAM,EAAE,aAAa;IAW1C,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIxB,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAsCvE,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CAIzB"}
1
+ {"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/gcp/storage.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gBAAgB,QACgD,CAAC;AAE9E,MAAM,WAAW,cAAc,CAAC,CAAC,GAAG,OAAO;IACzC,IAAI,EAAE,CAAC,CAAC;IACR,QAAQ,EAAE,IAAI,CAAC;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,iBAAiB;IAehB,QAAQ,CAAC,MAAM,EAAE,aAAa;IAd1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,KAAK,CAAkD;IAC/D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IAEjC,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,iBAAiB;gBAUrC,MAAM,EAAE,aAAa;IAQ1C,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,eAAe;YAMT,aAAa;YAgBb,YAAY;IAcpB,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IA6BvE,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CAIzB"}
@@ -1,26 +1,23 @@
1
- import { Storage } from '@google-cloud/storage';
2
1
  export const GCS_BUCKET_REGEX = /^(?:(?:https?:\/\/)?([^/]+)\.storage\.googleapis\.com\/?|gs:\/\/([^/]+))$/;
3
2
  export class GcpStorageWrapper {
4
3
  config;
5
- client;
6
4
  bucket;
7
5
  cache;
6
+ baseUrl;
8
7
  static fromBucketUrl(bucketUrl) {
9
8
  const match = bucketUrl.match(GCS_BUCKET_REGEX);
10
9
  if (!match)
11
10
  throw new Error('Could not parse bucket url');
12
11
  return new GcpStorageWrapper({
13
- bucket: match[1],
12
+ // Handle both http and gs:// formats
13
+ bucket: match[1] || match[2],
14
14
  caching: true,
15
15
  });
16
16
  }
17
17
  constructor(config) {
18
18
  this.config = config;
19
- this.client = new Storage({
20
- projectId: config.projectId,
21
- keyFilename: config.keyFilename,
22
- });
23
19
  this.bucket = config.bucket;
20
+ this.baseUrl = `https://storage.googleapis.com/storage/v1/b/${this.bucket}/o`;
24
21
  if (config.caching) {
25
22
  this.cache = {};
26
23
  }
@@ -28,34 +25,56 @@ export class GcpStorageWrapper {
28
25
  formatKey(key) {
29
26
  return this.config.folder ? `${this.config.folder}/${key}` : key;
30
27
  }
28
+ getCachedObject(key) {
29
+ return this.cache?.[key];
30
+ }
31
+ setCachedObject(key, value) {
32
+ if (this.cache) {
33
+ this.cache[key] = value;
34
+ }
35
+ }
36
+ async fetchMetadata(key) {
37
+ const url = new URL(`${this.baseUrl}/${encodeURIComponent(key)}`);
38
+ const response = await fetch(url.toString());
39
+ if (response.status === 404)
40
+ return undefined;
41
+ if (!response.ok) {
42
+ const responseText = await response.text();
43
+ throw new Error(`Failed to fetch object metadata: ${response.statusText}. ${responseText}`);
44
+ }
45
+ return response.json();
46
+ }
47
+ async fetchContent(key) {
48
+ const url = `${this.baseUrl}/${encodeURIComponent(key)}?alt=media`;
49
+ const response = await fetch(url);
50
+ const responseText = await response.text();
51
+ if (!response.ok) {
52
+ throw new Error(`Failed to fetch object content: ${response.statusText}. ${responseText}`);
53
+ }
54
+ return responseText;
55
+ }
31
56
  async getObject(key) {
32
- const Key = this.formatKey(key);
33
- if (this.cache?.[Key]) {
34
- return this.cache[Key];
57
+ const formattedKey = this.formatKey(key);
58
+ const cachedObject = this.getCachedObject(formattedKey);
59
+ if (cachedObject) {
60
+ return cachedObject;
35
61
  }
36
62
  try {
37
- const bucket = this.client.bucket(this.bucket);
38
- const file = bucket.file(Key);
39
- const [exists] = await file.exists();
40
- if (!exists) {
63
+ const metadata = await this.fetchMetadata(formattedKey);
64
+ if (!metadata)
41
65
  return undefined;
42
- }
43
- const [metadata] = await file.getMetadata();
44
- const [contents] = await file.download();
45
- const body = contents.toString('utf-8');
66
+ const body = await this.fetchContent(formattedKey);
46
67
  const result = {
47
68
  data: JSON.parse(body),
48
69
  // If no updated date is provided, use the Unix epoch start
49
70
  // 0 = Unix epoch start (1970-01-01T00:00:00.000Z)
50
71
  modified: new Date(metadata.updated ?? 0),
51
72
  };
52
- if (this.cache) {
53
- this.cache[Key] = result;
54
- }
73
+ this.setCachedObject(formattedKey, result);
55
74
  return result;
56
75
  }
57
76
  catch (e) {
58
- if (e.code === 404) {
77
+ if (e.status === 404) {
59
78
  return undefined;
60
79
  }
61
80
  throw e;
@@ -1 +1 @@
1
- {"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/gcp/storage.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/gcp/storage.ts"],"names":[],"mappings":"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"}