gate-evm-tools 1.0.28 → 1.2.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.
- package/README.md +47 -18
- package/bin/cli.js +6 -0
- package/bin/delivery.cjs +52 -0
- package/bin/manifest-bootstrap.js +4 -15
- package/dist/commands/check.d.ts.map +1 -1
- package/dist/commands/check.js +26 -2
- package/dist/commands/check.js.map +1 -1
- package/dist/commands/plan/file-store.d.ts.map +1 -0
- package/dist/commands/plan/generate-deployment.d.ts +48 -0
- package/dist/commands/plan/generate-deployment.d.ts.map +1 -0
- package/dist/commands/plan/generate-deployment.js +211 -0
- package/dist/commands/plan/generate-deployment.js.map +1 -0
- package/dist/commands/plan/helpers.d.ts.map +1 -0
- package/dist/commands/plan/index.d.ts +3 -0
- package/dist/commands/plan/index.d.ts.map +1 -0
- package/dist/commands/plan/index.js +88 -0
- package/dist/commands/plan/index.js.map +1 -0
- package/dist/commands/sync.js +1 -1
- package/dist/commands/sync.js.map +1 -1
- package/dist/core/BytecodeChecker.d.ts.map +1 -1
- package/dist/core/BytecodeChecker.js +27 -8
- package/dist/core/BytecodeChecker.js.map +1 -1
- package/dist/core/preparation/artifacts.d.ts +2 -0
- package/dist/core/preparation/artifacts.d.ts.map +1 -1
- package/dist/core/preparation/artifacts.js +9 -3
- package/dist/core/preparation/artifacts.js.map +1 -1
- package/dist/core/preparation/batch.d.ts +26 -0
- package/dist/core/preparation/batch.d.ts.map +1 -0
- package/dist/core/preparation/batch.js +72 -0
- package/dist/core/preparation/batch.js.map +1 -0
- package/dist/core/preparation/evm.d.ts +61 -6
- package/dist/core/preparation/evm.d.ts.map +1 -1
- package/dist/core/preparation/evm.js +122 -34
- package/dist/core/preparation/evm.js.map +1 -1
- package/dist/core/preparation/evmManifestSync.d.ts +68 -0
- package/dist/core/preparation/evmManifestSync.d.ts.map +1 -0
- package/dist/core/preparation/evmManifestSync.js +154 -0
- package/dist/core/preparation/evmManifestSync.js.map +1 -0
- package/dist/core/preparation/index.d.ts +40 -2
- package/dist/core/preparation/index.d.ts.map +1 -1
- package/dist/core/preparation/index.js +3 -3
- package/dist/core/preparation/index.js.map +1 -1
- package/dist/core/preparation/manifest.d.ts +17 -3
- package/dist/core/preparation/manifest.d.ts.map +1 -1
- package/dist/core/preparation/manifest.js +23 -28
- package/dist/core/preparation/manifest.js.map +1 -1
- package/dist/core/preparation/normalize.d.ts.map +1 -1
- package/dist/core/preparation/normalize.js +67 -20
- package/dist/core/preparation/normalize.js.map +1 -1
- package/dist/core/preparation/transparent.d.ts +23 -0
- package/dist/core/preparation/transparent.d.ts.map +1 -0
- package/dist/core/preparation/transparent.js +103 -0
- package/dist/core/preparation/transparent.js.map +1 -0
- package/dist/core/preparation/types.d.ts +54 -7
- package/dist/core/preparation/types.d.ts.map +1 -1
- package/dist/core/preparation/zksync.d.ts.map +1 -1
- package/dist/core/preparation/zksync.js +2 -0
- package/dist/core/preparation/zksync.js.map +1 -1
- package/dist/custody/credential.d.ts.map +1 -1
- package/dist/custody/credential.js +1 -6
- package/dist/custody/credential.js.map +1 -1
- package/dist/custody/hardhat-runtime.d.ts.map +1 -1
- package/dist/custody/hardhat-runtime.js +2 -0
- package/dist/custody/hardhat-runtime.js.map +1 -1
- package/dist/custody/hardhat.d.ts +1 -0
- package/dist/custody/hardhat.d.ts.map +1 -1
- package/dist/custody/hardhat.js +1 -0
- package/dist/custody/hardhat.js.map +1 -1
- package/dist/custody/index.d.ts +1 -0
- package/dist/custody/index.d.ts.map +1 -1
- package/dist/custody/index.js +1 -0
- package/dist/custody/index.js.map +1 -1
- package/dist/custody/provider-wait.d.ts +13 -0
- package/dist/custody/provider-wait.d.ts.map +1 -0
- package/dist/custody/provider-wait.js +78 -0
- package/dist/custody/provider-wait.js.map +1 -0
- package/dist/delivery/policy.d.ts +6 -0
- package/dist/delivery/policy.d.ts.map +1 -0
- package/dist/delivery/policy.js +24 -0
- package/dist/delivery/policy.js.map +1 -0
- package/dist/deployment-evm/index.d.ts +4 -0
- package/dist/deployment-evm/index.d.ts.map +1 -0
- package/dist/deployment-evm/index.js +3 -0
- package/dist/deployment-evm/index.js.map +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +9 -0
- package/dist/index.js.map +1 -1
- package/dist/sync/index.d.ts +15 -0
- package/dist/sync/index.d.ts.map +1 -1
- package/dist/sync/index.js +13 -0
- package/dist/sync/index.js.map +1 -1
- package/dist/types.d.ts +3 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/workflow/index.d.ts +10 -2
- package/dist/workflow/index.d.ts.map +1 -1
- package/dist/workflow/index.js +6 -0
- package/dist/workflow/index.js.map +1 -1
- package/dist-cjs/core/BytecodeChecker.js +526 -0
- package/dist-cjs/core/BytecodeChecker.js.map +1 -0
- package/dist-cjs/core/legacyProxyArtifact.js +42 -0
- package/dist-cjs/core/legacyProxyArtifact.js.map +1 -0
- package/dist-cjs/core/preparation/artifacts.js +11 -4
- package/dist-cjs/core/preparation/artifacts.js.map +1 -1
- package/dist-cjs/core/preparation/batch.js +76 -0
- package/dist-cjs/core/preparation/batch.js.map +1 -0
- package/dist-cjs/core/preparation/evm.js +128 -37
- package/dist-cjs/core/preparation/evm.js.map +1 -1
- package/dist-cjs/core/preparation/evmManifestSync.js +163 -0
- package/dist-cjs/core/preparation/evmManifestSync.js.map +1 -0
- package/dist-cjs/core/preparation/index.js +3 -3
- package/dist-cjs/core/preparation/index.js.map +1 -1
- package/dist-cjs/core/preparation/manifest.js +25 -30
- package/dist-cjs/core/preparation/manifest.js.map +1 -1
- package/dist-cjs/core/preparation/normalize.js +67 -20
- package/dist-cjs/core/preparation/normalize.js.map +1 -1
- package/dist-cjs/core/preparation/transparent.js +110 -0
- package/dist-cjs/core/preparation/transparent.js.map +1 -0
- package/dist-cjs/core/preparation/zksync.js +2 -0
- package/dist-cjs/core/preparation/zksync.js.map +1 -1
- package/dist-cjs/custody/credential.js +1 -6
- package/dist-cjs/custody/credential.js.map +1 -1
- package/dist-cjs/custody/hardhat-runtime.js +2 -0
- package/dist-cjs/custody/hardhat-runtime.js.map +1 -1
- package/dist-cjs/custody/hardhat.js +3 -1
- package/dist-cjs/custody/hardhat.js.map +1 -1
- package/dist-cjs/custody/index.js +3 -1
- package/dist-cjs/custody/index.js.map +1 -1
- package/dist-cjs/custody/provider-wait.js +81 -0
- package/dist-cjs/custody/provider-wait.js.map +1 -0
- package/dist-cjs/delivery/policy.js +29 -0
- package/dist-cjs/delivery/policy.js.map +1 -0
- package/dist-cjs/deployment-evm/index.js +10 -0
- package/dist-cjs/deployment-evm/index.js.map +1 -0
- package/dist-cjs/sync/index.js +13 -0
- package/dist-cjs/sync/index.js.map +1 -1
- package/dist-cjs/workflow/index.js +22 -1
- package/dist-cjs/workflow/index.js.map +1 -1
- package/dist-runtime/config/hardhatAdapters.js +2 -1
- package/dist-runtime/config/hardhatAdapters.js.map +1 -1
- package/dist-runtime/config/openzeppelin.d.ts +2 -1
- package/dist-runtime/config/openzeppelin.js +2 -19
- package/dist-runtime/config/openzeppelin.js.map +1 -1
- package/dist-runtime/delivery/abi.d.ts +14 -0
- package/dist-runtime/delivery/abi.js +161 -0
- package/dist-runtime/delivery/abi.js.map +1 -0
- package/dist-runtime/delivery/aggregate-bootstrap.d.ts +12 -0
- package/dist-runtime/delivery/aggregate-bootstrap.js +42 -0
- package/dist-runtime/delivery/aggregate-bootstrap.js.map +1 -0
- package/dist-runtime/delivery/aggregate-channel.d.ts +28 -0
- package/dist-runtime/delivery/aggregate-channel.js +159 -0
- package/dist-runtime/delivery/aggregate-channel.js.map +1 -0
- package/dist-runtime/delivery/aggregate-diagnostics.d.ts +14 -0
- package/dist-runtime/delivery/aggregate-diagnostics.js +73 -0
- package/dist-runtime/delivery/aggregate-diagnostics.js.map +1 -0
- package/dist-runtime/delivery/aggregate-inputs.d.ts +172 -0
- package/dist-runtime/delivery/aggregate-inputs.js +57 -0
- package/dist-runtime/delivery/aggregate-inputs.js.map +1 -0
- package/dist-runtime/delivery/aggregate-source.d.ts +25 -0
- package/dist-runtime/delivery/aggregate-source.js +87 -0
- package/dist-runtime/delivery/aggregate-source.js.map +1 -0
- package/dist-runtime/delivery/aggregate-worker.d.ts +1 -0
- package/dist-runtime/delivery/aggregate-worker.js +199 -0
- package/dist-runtime/delivery/aggregate-worker.js.map +1 -0
- package/dist-runtime/delivery/aggregate.d.ts +51 -0
- package/dist-runtime/delivery/aggregate.js +190 -0
- package/dist-runtime/delivery/aggregate.js.map +1 -0
- package/dist-runtime/delivery/bindings.d.ts +21 -0
- package/dist-runtime/delivery/bindings.js +53 -0
- package/dist-runtime/delivery/bindings.js.map +1 -0
- package/dist-runtime/delivery/business-extension.d.ts +10 -0
- package/dist-runtime/delivery/business-extension.js +38 -0
- package/dist-runtime/delivery/business-extension.js.map +1 -0
- package/dist-runtime/delivery/calldata-archive.d.ts +18 -0
- package/dist-runtime/delivery/calldata-archive.js +31 -0
- package/dist-runtime/delivery/calldata-archive.js.map +1 -0
- package/dist-runtime/delivery/calldata-details.d.ts +47 -0
- package/dist-runtime/delivery/calldata-details.js +94 -0
- package/dist-runtime/delivery/calldata-details.js.map +1 -0
- package/dist-runtime/delivery/calldata-format.d.ts +4 -0
- package/dist-runtime/delivery/calldata-format.js +17 -0
- package/dist-runtime/delivery/calldata-format.js.map +1 -0
- package/dist-runtime/delivery/calldata-preparations.d.ts +13 -0
- package/dist-runtime/delivery/calldata-preparations.js +85 -0
- package/dist-runtime/delivery/calldata-preparations.js.map +1 -0
- package/dist-runtime/delivery/calldata-review.d.ts +44 -0
- package/dist-runtime/delivery/calldata-review.js +131 -0
- package/dist-runtime/delivery/calldata-review.js.map +1 -0
- package/dist-runtime/delivery/check-code.d.ts +19 -0
- package/dist-runtime/delivery/check-code.js +63 -0
- package/dist-runtime/delivery/check-code.js.map +1 -0
- package/dist-runtime/delivery/closure-format.d.ts +77 -0
- package/dist-runtime/delivery/closure-format.js +225 -0
- package/dist-runtime/delivery/closure-format.js.map +1 -0
- package/dist-runtime/delivery/codec-pin.d.ts +2 -0
- package/dist-runtime/delivery/codec-pin.js +7 -0
- package/dist-runtime/delivery/codec-pin.js.map +1 -0
- package/dist-runtime/delivery/codec.d.ts +19 -0
- package/dist-runtime/delivery/codec.js +73 -0
- package/dist-runtime/delivery/codec.js.map +1 -0
- package/dist-runtime/delivery/compiler-dependency-pins.d.ts +7 -0
- package/dist-runtime/delivery/compiler-dependency-pins.js +1689 -0
- package/dist-runtime/delivery/compiler-dependency-pins.js.map +1 -0
- package/dist-runtime/delivery/compiler-files.d.ts +40 -0
- package/dist-runtime/delivery/compiler-files.js +222 -0
- package/dist-runtime/delivery/compiler-files.js.map +1 -0
- package/dist-runtime/delivery/compiler-io.d.ts +2 -0
- package/dist-runtime/delivery/compiler-io.js +13 -0
- package/dist-runtime/delivery/compiler-io.js.map +1 -0
- package/dist-runtime/delivery/compiler-pins.d.ts +10 -0
- package/dist-runtime/delivery/compiler-pins.js +147 -0
- package/dist-runtime/delivery/compiler-pins.js.map +1 -0
- package/dist-runtime/delivery/compiler.d.ts +188 -0
- package/dist-runtime/delivery/compiler.js +851 -0
- package/dist-runtime/delivery/compiler.js.map +1 -0
- package/dist-runtime/delivery/config.d.ts +48 -0
- package/dist-runtime/delivery/config.js +124 -0
- package/dist-runtime/delivery/config.js.map +1 -0
- package/dist-runtime/delivery/configuration-definition.d.ts +31 -0
- package/dist-runtime/delivery/configuration-definition.js +343 -0
- package/dist-runtime/delivery/configuration-definition.js.map +1 -0
- package/dist-runtime/delivery/configuration-hre.d.ts +17 -0
- package/dist-runtime/delivery/configuration-hre.js +198 -0
- package/dist-runtime/delivery/configuration-hre.js.map +1 -0
- package/dist-runtime/delivery/configuration-runtime.d.ts +36 -0
- package/dist-runtime/delivery/configuration-runtime.js +248 -0
- package/dist-runtime/delivery/configuration-runtime.js.map +1 -0
- package/dist-runtime/delivery/configuration.d.ts +35 -0
- package/dist-runtime/delivery/configuration.js +86 -0
- package/dist-runtime/delivery/configuration.js.map +1 -0
- package/dist-runtime/delivery/contract-source.d.ts +14 -0
- package/dist-runtime/delivery/contract-source.js +138 -0
- package/dist-runtime/delivery/contract-source.js.map +1 -0
- package/dist-runtime/delivery/create2.d.ts +3 -0
- package/dist-runtime/delivery/create2.js +48 -0
- package/dist-runtime/delivery/create2.js.map +1 -0
- package/dist-runtime/delivery/custom-closure.d.ts +27 -0
- package/dist-runtime/delivery/custom-closure.js +818 -0
- package/dist-runtime/delivery/custom-closure.js.map +1 -0
- package/dist-runtime/delivery/custom-format.d.ts +35 -0
- package/dist-runtime/delivery/custom-format.js +410 -0
- package/dist-runtime/delivery/custom-format.js.map +1 -0
- package/dist-runtime/delivery/custom.d.ts +32 -0
- package/dist-runtime/delivery/custom.js +158 -0
- package/dist-runtime/delivery/custom.js.map +1 -0
- package/dist-runtime/delivery/data.d.ts +7 -0
- package/dist-runtime/delivery/data.js +86 -0
- package/dist-runtime/delivery/data.js.map +1 -0
- package/dist-runtime/delivery/development.d.ts +92 -0
- package/dist-runtime/delivery/development.js +406 -0
- package/dist-runtime/delivery/development.js.map +1 -0
- package/dist-runtime/delivery/engine.d.ts +9 -0
- package/dist-runtime/delivery/engine.js +23 -0
- package/dist-runtime/delivery/engine.js.map +1 -0
- package/dist-runtime/delivery/eoa-observation.d.ts +43 -0
- package/dist-runtime/delivery/eoa-observation.js +145 -0
- package/dist-runtime/delivery/eoa-observation.js.map +1 -0
- package/dist-runtime/delivery/eoa-signed.d.ts +2 -0
- package/dist-runtime/delivery/eoa-signed.js +74 -0
- package/dist-runtime/delivery/eoa-signed.js.map +1 -0
- package/dist-runtime/delivery/eoa.d.ts +82 -0
- package/dist-runtime/delivery/eoa.js +274 -0
- package/dist-runtime/delivery/eoa.js.map +1 -0
- package/dist-runtime/delivery/execution-db.d.ts +20 -0
- package/dist-runtime/delivery/execution-db.js +153 -0
- package/dist-runtime/delivery/execution-db.js.map +1 -0
- package/dist-runtime/delivery/execution-files.d.ts +9 -0
- package/dist-runtime/delivery/execution-files.js +138 -0
- package/dist-runtime/delivery/execution-files.js.map +1 -0
- package/dist-runtime/delivery/execution-identity.d.ts +15 -0
- package/dist-runtime/delivery/execution-identity.js +33 -0
- package/dist-runtime/delivery/execution-identity.js.map +1 -0
- package/dist-runtime/delivery/execution-model.d.ts +56 -0
- package/dist-runtime/delivery/execution-model.js +66 -0
- package/dist-runtime/delivery/execution-model.js.map +1 -0
- package/dist-runtime/delivery/execution-store.d.ts +48 -0
- package/dist-runtime/delivery/execution-store.js +361 -0
- package/dist-runtime/delivery/execution-store.js.map +1 -0
- package/dist-runtime/delivery/existing-code.d.ts +37 -0
- package/dist-runtime/delivery/existing-code.js +83 -0
- package/dist-runtime/delivery/existing-code.js.map +1 -0
- package/dist-runtime/delivery/export.d.ts +51 -0
- package/dist-runtime/delivery/export.js +69 -0
- package/dist-runtime/delivery/export.js.map +1 -0
- package/dist-runtime/delivery/forkAudit.d.ts +119 -0
- package/dist-runtime/delivery/forkAudit.js +473 -0
- package/dist-runtime/delivery/forkAudit.js.map +1 -0
- package/dist-runtime/delivery/hardhat.d.ts +3 -0
- package/dist-runtime/delivery/hardhat.js +45 -0
- package/dist-runtime/delivery/hardhat.js.map +1 -0
- package/dist-runtime/delivery/history-registration.d.ts +2 -0
- package/dist-runtime/delivery/history-registration.js +17 -0
- package/dist-runtime/delivery/history-registration.js.map +1 -0
- package/dist-runtime/delivery/identities.d.ts +22 -0
- package/dist-runtime/delivery/identities.js +97 -0
- package/dist-runtime/delivery/identities.js.map +1 -0
- package/dist-runtime/delivery/input-files.d.ts +5 -0
- package/dist-runtime/delivery/input-files.js +70 -0
- package/dist-runtime/delivery/input-files.js.map +1 -0
- package/dist-runtime/delivery/inputs.d.ts +62 -0
- package/dist-runtime/delivery/inputs.js +194 -0
- package/dist-runtime/delivery/inputs.js.map +1 -0
- package/dist-runtime/delivery/journal.d.ts +35 -0
- package/dist-runtime/delivery/journal.js +278 -0
- package/dist-runtime/delivery/journal.js.map +1 -0
- package/dist-runtime/delivery/manifest.d.ts +14 -0
- package/dist-runtime/delivery/manifest.js +68 -0
- package/dist-runtime/delivery/manifest.js.map +1 -0
- package/dist-runtime/delivery/materialization.d.ts +20 -0
- package/dist-runtime/delivery/materialization.js +138 -0
- package/dist-runtime/delivery/materialization.js.map +1 -0
- package/dist-runtime/delivery/observations.d.ts +31 -0
- package/dist-runtime/delivery/observations.js +38 -0
- package/dist-runtime/delivery/observations.js.map +1 -0
- package/dist-runtime/delivery/parameter-defaults.d.ts +10 -0
- package/dist-runtime/delivery/parameter-defaults.js +86 -0
- package/dist-runtime/delivery/parameter-defaults.js.map +1 -0
- package/dist-runtime/delivery/parameters.d.ts +55 -0
- package/dist-runtime/delivery/parameters.js +279 -0
- package/dist-runtime/delivery/parameters.js.map +1 -0
- package/dist-runtime/delivery/pending.d.ts +70 -0
- package/dist-runtime/delivery/pending.js +99 -0
- package/dist-runtime/delivery/pending.js.map +1 -0
- package/dist-runtime/delivery/plan.d.ts +50 -0
- package/dist-runtime/delivery/plan.js +209 -0
- package/dist-runtime/delivery/plan.js.map +1 -0
- package/dist-runtime/delivery/planning.d.ts +84 -0
- package/dist-runtime/delivery/planning.js +318 -0
- package/dist-runtime/delivery/planning.js.map +1 -0
- package/dist-runtime/delivery/policy.d.ts +4 -0
- package/dist-runtime/delivery/policy.js +9 -0
- package/dist-runtime/delivery/policy.js.map +1 -0
- package/dist-runtime/delivery/preparation.d.ts +6 -0
- package/dist-runtime/delivery/preparation.js +178 -0
- package/dist-runtime/delivery/preparation.js.map +1 -0
- package/dist-runtime/delivery/production-environment.d.ts +2 -0
- package/dist-runtime/delivery/production-environment.js +13 -0
- package/dist-runtime/delivery/production-environment.js.map +1 -0
- package/dist-runtime/delivery/production-finalization.d.ts +86 -0
- package/dist-runtime/delivery/production-finalization.js +292 -0
- package/dist-runtime/delivery/production-finalization.js.map +1 -0
- package/dist-runtime/delivery/production-intent.d.ts +2 -0
- package/dist-runtime/delivery/production-intent.js +16 -0
- package/dist-runtime/delivery/production-intent.js.map +1 -0
- package/dist-runtime/delivery/production.d.ts +582 -0
- package/dist-runtime/delivery/production.js +445 -0
- package/dist-runtime/delivery/production.js.map +1 -0
- package/dist-runtime/delivery/project-files.d.ts +8 -0
- package/dist-runtime/delivery/project-files.js +87 -0
- package/dist-runtime/delivery/project-files.js.map +1 -0
- package/dist-runtime/delivery/project-rpc.d.ts +19 -0
- package/dist-runtime/delivery/project-rpc.js +138 -0
- package/dist-runtime/delivery/project-rpc.js.map +1 -0
- package/dist-runtime/delivery/project.d.ts +17 -0
- package/dist-runtime/delivery/project.js +170 -0
- package/dist-runtime/delivery/project.js.map +1 -0
- package/dist-runtime/delivery/protocol.d.ts +49 -0
- package/dist-runtime/delivery/protocol.js +112 -0
- package/dist-runtime/delivery/protocol.js.map +1 -0
- package/dist-runtime/delivery/public-calldata.d.ts +25 -0
- package/dist-runtime/delivery/public-calldata.js +97 -0
- package/dist-runtime/delivery/public-calldata.js.map +1 -0
- package/dist-runtime/delivery/references.d.ts +19 -0
- package/dist-runtime/delivery/references.js +84 -0
- package/dist-runtime/delivery/references.js.map +1 -0
- package/dist-runtime/delivery/release-graph.d.ts +97 -0
- package/dist-runtime/delivery/release-graph.js +139 -0
- package/dist-runtime/delivery/release-graph.js.map +1 -0
- package/dist-runtime/delivery/release-history-capture.d.ts +7 -0
- package/dist-runtime/delivery/release-history-capture.js +76 -0
- package/dist-runtime/delivery/release-history-capture.js.map +1 -0
- package/dist-runtime/delivery/release-history.d.ts +43 -0
- package/dist-runtime/delivery/release-history.js +322 -0
- package/dist-runtime/delivery/release-history.js.map +1 -0
- package/dist-runtime/delivery/release-inputs.d.ts +33 -0
- package/dist-runtime/delivery/release-inputs.js +129 -0
- package/dist-runtime/delivery/release-inputs.js.map +1 -0
- package/dist-runtime/delivery/release.d.ts +196 -0
- package/dist-runtime/delivery/release.js +261 -0
- package/dist-runtime/delivery/release.js.map +1 -0
- package/dist-runtime/delivery/safe-manifest.d.ts +9 -0
- package/dist-runtime/delivery/safe-manifest.js +13 -0
- package/dist-runtime/delivery/safe-manifest.js.map +1 -0
- package/dist-runtime/delivery/safe-observation.d.ts +30 -0
- package/dist-runtime/delivery/safe-observation.js +487 -0
- package/dist-runtime/delivery/safe-observation.js.map +1 -0
- package/dist-runtime/delivery/safe-prepare.d.ts +13 -0
- package/dist-runtime/delivery/safe-prepare.js +81 -0
- package/dist-runtime/delivery/safe-prepare.js.map +1 -0
- package/dist-runtime/delivery/safe.d.ts +92 -0
- package/dist-runtime/delivery/safe.js +254 -0
- package/dist-runtime/delivery/safe.js.map +1 -0
- package/dist-runtime/delivery/same-fork-baseline.d.ts +8 -0
- package/dist-runtime/delivery/same-fork-baseline.js +21 -0
- package/dist-runtime/delivery/same-fork-baseline.js.map +1 -0
- package/dist-runtime/delivery/setup.d.ts +31 -0
- package/dist-runtime/delivery/setup.js +230 -0
- package/dist-runtime/delivery/setup.js.map +1 -0
- package/dist-runtime/delivery/source.d.ts +42 -0
- package/dist-runtime/delivery/source.js +139 -0
- package/dist-runtime/delivery/source.js.map +1 -0
- package/dist-runtime/delivery/target-fields.d.ts +2 -0
- package/dist-runtime/delivery/target-fields.js +11 -0
- package/dist-runtime/delivery/target-fields.js.map +1 -0
- package/dist-runtime/delivery/task-identity.d.ts +23 -0
- package/dist-runtime/delivery/task-identity.js +109 -0
- package/dist-runtime/delivery/task-identity.js.map +1 -0
- package/dist-runtime/delivery/toolchain.d.ts +3 -0
- package/dist-runtime/delivery/toolchain.js +52 -0
- package/dist-runtime/delivery/toolchain.js.map +1 -0
- package/dist-runtime/delivery/validation.d.ts +9 -0
- package/dist-runtime/delivery/validation.js +155 -0
- package/dist-runtime/delivery/validation.js.map +1 -0
- package/dist-runtime/delivery/verification.d.ts +16 -0
- package/dist-runtime/delivery/verification.js +65 -0
- package/dist-runtime/delivery/verification.js.map +1 -0
- package/dist-runtime/migrate.js +1 -0
- package/dist-runtime/migrate.js.map +1 -1
- package/dist-runtime/miner/binary.d.ts +2 -0
- package/dist-runtime/miner/binary.js +54 -0
- package/dist-runtime/miner/binary.js.map +1 -0
- package/dist-runtime/miner/cli.d.ts +1 -0
- package/dist-runtime/miner/cli.js +131 -0
- package/dist-runtime/miner/cli.js.map +1 -0
- package/dist-runtime/miner/index.d.ts +5 -0
- package/dist-runtime/miner/index.js +13 -0
- package/dist-runtime/miner/index.js.map +1 -0
- package/dist-runtime/miner/request.d.ts +7 -0
- package/dist-runtime/miner/request.js +73 -0
- package/dist-runtime/miner/request.js.map +1 -0
- package/dist-runtime/miner/runner.d.ts +2 -0
- package/dist-runtime/miner/runner.js +131 -0
- package/dist-runtime/miner/runner.js.map +1 -0
- package/dist-runtime/miner/types.d.ts +89 -0
- package/dist-runtime/miner/types.js +3 -0
- package/dist-runtime/miner/types.js.map +1 -0
- package/dist-runtime/miner/verify.d.ts +2 -0
- package/dist-runtime/miner/verify.js +75 -0
- package/dist-runtime/miner/verify.js.map +1 -0
- package/dist-runtime/runtime-identity.json +2 -2
- package/dist-runtime/vendor/plan-codec/index.cjs +897 -0
- package/dist-runtime/vendor/plan-codec/index.d.cts +38 -0
- package/dist-runtime/vendor/plan-codec/provenance.json +25 -0
- package/dist-runtime/workflow/engine.d.ts +14 -0
- package/dist-runtime/workflow/engine.js +160 -0
- package/dist-runtime/workflow/engine.js.map +1 -0
- package/dist-runtime/workflow/lib/authority.d.ts +6 -3
- package/dist-runtime/workflow/lib/authority.js.map +1 -1
- package/dist-runtime/workflow/lib/calls.d.ts +1 -1
- package/dist-runtime/workflow/lib/calls.js +44 -34
- package/dist-runtime/workflow/lib/calls.js.map +1 -1
- package/dist-runtime/workflow/lib/canonicalData.d.ts +8 -0
- package/dist-runtime/workflow/lib/canonicalData.js +68 -0
- package/dist-runtime/workflow/lib/canonicalData.js.map +1 -0
- package/dist-runtime/workflow/lib/checkCodeRunner.js +7 -4
- package/dist-runtime/workflow/lib/checkCodeRunner.js.map +1 -1
- package/dist-runtime/workflow/lib/config.d.ts +3 -1
- package/dist-runtime/workflow/lib/config.js.map +1 -1
- package/dist-runtime/workflow/lib/context.d.ts +77 -0
- package/dist-runtime/workflow/lib/context.js +3 -0
- package/dist-runtime/workflow/lib/context.js.map +1 -0
- package/dist-runtime/workflow/lib/create2.d.ts +5 -27
- package/dist-runtime/workflow/lib/create2.js +11 -79
- package/dist-runtime/workflow/lib/create2.js.map +1 -1
- package/dist-runtime/workflow/lib/deploymentInfo.d.ts +2 -0
- package/dist-runtime/workflow/lib/deploymentInfo.js +6 -0
- package/dist-runtime/workflow/lib/deploymentInfo.js.map +1 -1
- package/dist-runtime/workflow/lib/deploymentRecords.d.ts +2 -0
- package/dist-runtime/workflow/lib/deploymentRecords.js +1 -1
- package/dist-runtime/workflow/lib/deploymentRecords.js.map +1 -1
- package/dist-runtime/workflow/lib/deployments.d.ts +5 -5
- package/dist-runtime/workflow/lib/deployments.js +5 -13
- package/dist-runtime/workflow/lib/deployments.js.map +1 -1
- package/dist-runtime/workflow/lib/evidencePorts.d.ts +55 -0
- package/dist-runtime/workflow/lib/evidencePorts.js +3 -0
- package/dist-runtime/workflow/lib/evidencePorts.js.map +1 -0
- package/dist-runtime/workflow/lib/executionPlan.d.ts +4 -42
- package/dist-runtime/workflow/lib/executionPlan.js +15 -210
- package/dist-runtime/workflow/lib/executionPlan.js.map +1 -1
- package/dist-runtime/workflow/lib/externalExecutionScanner.js +2 -1
- package/dist-runtime/workflow/lib/externalExecutionScanner.js.map +1 -1
- package/dist-runtime/workflow/lib/gateTool.d.ts +6 -2
- package/dist-runtime/workflow/lib/gateTool.js +22 -12
- package/dist-runtime/workflow/lib/gateTool.js.map +1 -1
- package/dist-runtime/workflow/lib/gateToolSync.d.ts +4 -1
- package/dist-runtime/workflow/lib/gateToolSync.js +8 -2
- package/dist-runtime/workflow/lib/gateToolSync.js.map +1 -1
- package/dist-runtime/workflow/lib/operationNames.d.ts +3 -0
- package/dist-runtime/workflow/lib/operationNames.js +34 -0
- package/dist-runtime/workflow/lib/operationNames.js.map +1 -0
- package/dist-runtime/workflow/lib/parameters.d.ts +1 -1
- package/dist-runtime/workflow/lib/parameters.js +11 -22
- package/dist-runtime/workflow/lib/parameters.js.map +1 -1
- package/dist-runtime/workflow/lib/pendingDeploymentReuse.js +18 -52
- package/dist-runtime/workflow/lib/pendingDeploymentReuse.js.map +1 -1
- package/dist-runtime/workflow/lib/pendingUupsBinding.d.ts +42 -0
- package/dist-runtime/workflow/lib/pendingUupsBinding.js +39 -0
- package/dist-runtime/workflow/lib/pendingUupsBinding.js.map +1 -0
- package/dist-runtime/workflow/lib/plan.d.ts +55 -0
- package/dist-runtime/workflow/lib/plan.js +324 -0
- package/dist-runtime/workflow/lib/plan.js.map +1 -0
- package/dist-runtime/workflow/lib/planCli.d.ts +14 -0
- package/dist-runtime/workflow/lib/planCli.js +279 -0
- package/dist-runtime/workflow/lib/planCli.js.map +1 -0
- package/dist-runtime/workflow/lib/preparationEvidence.d.ts +4 -0
- package/dist-runtime/workflow/lib/preparationEvidence.js +19 -0
- package/dist-runtime/workflow/lib/preparationEvidence.js.map +1 -0
- package/dist-runtime/workflow/lib/proxy.d.ts +4 -2
- package/dist-runtime/workflow/lib/proxy.js +3 -4
- package/dist-runtime/workflow/lib/proxy.js.map +1 -1
- package/dist-runtime/workflow/lib/runtime.d.ts +6 -0
- package/dist-runtime/workflow/lib/runtime.js +48 -0
- package/dist-runtime/workflow/lib/runtime.js.map +1 -0
- package/dist-runtime/workflow/lib/signer.d.ts +3 -2
- package/dist-runtime/workflow/lib/signer.js +18 -18
- package/dist-runtime/workflow/lib/signer.js.map +1 -1
- package/dist-runtime/workflow/lib/simulation.d.ts +13 -6
- package/dist-runtime/workflow/lib/simulation.js +39 -31
- package/dist-runtime/workflow/lib/simulation.js.map +1 -1
- package/dist-runtime/workflow/lib/state.js +3 -3
- package/dist-runtime/workflow/lib/state.js.map +1 -1
- package/dist-runtime/workflow/lib/staticValidation.d.ts +28 -0
- package/dist-runtime/workflow/lib/staticValidation.js +54 -10
- package/dist-runtime/workflow/lib/staticValidation.js.map +1 -1
- package/dist-runtime/workflow/lib/transactionPlanner.d.ts +62 -0
- package/dist-runtime/workflow/lib/transactionPlanner.js +258 -0
- package/dist-runtime/workflow/lib/transactionPlanner.js.map +1 -0
- package/dist-runtime/workflow/lib/typedValue.d.ts +3 -0
- package/dist-runtime/workflow/lib/typedValue.js +76 -0
- package/dist-runtime/workflow/lib/typedValue.js.map +1 -0
- package/dist-runtime/workflow/lib/validation.d.ts +23 -0
- package/dist-runtime/workflow/lib/validation.js +15 -0
- package/dist-runtime/workflow/lib/validation.js.map +1 -0
- package/dist-runtime/workflow/planAdd.d.ts +1 -0
- package/dist-runtime/workflow/planAdd.js +11 -0
- package/dist-runtime/workflow/planAdd.js.map +1 -0
- package/dist-runtime/workflow/planRead.d.ts +1 -0
- package/dist-runtime/workflow/planRead.js +11 -0
- package/dist-runtime/workflow/planRead.js.map +1 -0
- package/dist-runtime/workflow/planStatus.d.ts +1 -0
- package/dist-runtime/workflow/planStatus.js +11 -0
- package/dist-runtime/workflow/planStatus.js.map +1 -0
- package/dist-runtime/workflow/planWrite.d.ts +1 -0
- package/dist-runtime/workflow/planWrite.js +11 -0
- package/dist-runtime/workflow/planWrite.js.map +1 -0
- package/dist-runtime/workflow/run.d.ts +1 -40
- package/dist-runtime/workflow/run.js +69 -139
- package/dist-runtime/workflow/run.js.map +1 -1
- package/dist-runtime/workflow/staticValidate.js +8 -3
- package/dist-runtime/workflow/staticValidate.js.map +1 -1
- package/dist-runtime/workflow/steps/call.d.ts +1 -1
- package/dist-runtime/workflow/steps/check.d.ts +1 -1
- package/dist-runtime/workflow/steps/custom.d.ts +1 -1
- package/dist-runtime/workflow/steps/deploy.d.ts +1 -1
- package/dist-runtime/workflow/steps/deploy.js +110 -55
- package/dist-runtime/workflow/steps/deploy.js.map +1 -1
- package/dist-runtime/workflow/steps/upgrade.d.ts +1 -1
- package/dist-runtime/workflow/steps/upgrade.js +84 -49
- package/dist-runtime/workflow/steps/upgrade.js.map +1 -1
- package/dist-runtime/workflow/steps/view.d.ts +1 -1
- package/docs/compiler-qualification.md +38 -0
- package/docs/configuration-runtime-observation.md +29 -0
- package/docs/create2-miner.md +100 -0
- package/docs/delivery-aggregate.md +29 -0
- package/docs/delivery-calldata.md +27 -0
- package/docs/delivery-custom-input-closure.md +51 -0
- package/docs/delivery-development.md +38 -0
- package/docs/delivery-eoa.md +46 -0
- package/docs/delivery-evm-manifest.md +20 -0
- package/docs/delivery-execution-store.md +33 -0
- package/docs/delivery-inputs.md +95 -0
- package/docs/delivery-parameters.md +65 -0
- package/docs/delivery-planning.md +140 -0
- package/docs/delivery-release.md +119 -0
- package/docs/delivery-safe.md +75 -0
- package/docs/delivery-setup.md +198 -0
- package/docs/delivery-source.md +67 -0
- package/docs/direct-package-acceptance.md +2 -0
- package/docs/openzeppelin-acceptance.md +86 -0
- package/docs/openzeppelin-baseline.json +27 -0
- package/docs/openzeppelin-integration.md +115 -0
- package/docs/plans/2026-10-28-openzeppelin-toolkit-consolidation.md +396 -0
- package/docs/plans/2026-11-02-transparent-proxy-delivery.md +78 -0
- package/docs/superpowers/plans/2026-08-17-custody-hardhat-signers.md +1 -1
- package/docs/superpowers/plans/2026-09-24-scheme-aware-static-validation.md +193 -0
- package/docs/superpowers/plans/2026-10-28-create2-miner.md +82 -0
- package/docs/workflow-reference.md +12 -4
- package/docs/workflow-runtime.md +6 -0
- package/package.json +148 -10
- package/resources/create2/LICENSE +21 -0
- package/resources/create2/README.md +9 -0
- package/resources/create2/darwin-arm64/smartflow_miner +0 -0
- package/resources/create2/darwin-x64/smartflow_miner +0 -0
- package/resources/create2/manifest.json +27 -0
- package/runtime/config/hardhatAdapters.ts +2 -1
- package/runtime/config/openzeppelin.ts +3 -21
- package/runtime/delivery/abi.ts +225 -0
- package/runtime/delivery/aggregate-bootstrap.ts +31 -0
- package/runtime/delivery/aggregate-channel.ts +88 -0
- package/runtime/delivery/aggregate-diagnostics.ts +63 -0
- package/runtime/delivery/aggregate-inputs.ts +39 -0
- package/runtime/delivery/aggregate-source.ts +57 -0
- package/runtime/delivery/aggregate-worker.ts +143 -0
- package/runtime/delivery/aggregate.ts +139 -0
- package/runtime/delivery/bindings.ts +37 -0
- package/runtime/delivery/business-extension.ts +33 -0
- package/runtime/delivery/calldata-archive.ts +25 -0
- package/runtime/delivery/calldata-details.ts +90 -0
- package/runtime/delivery/calldata-format.ts +14 -0
- package/runtime/delivery/calldata-preparations.ts +76 -0
- package/runtime/delivery/calldata-review.ts +126 -0
- package/runtime/delivery/check-code.ts +38 -0
- package/runtime/delivery/closure-format.ts +350 -0
- package/runtime/delivery/codec-pin.ts +3 -0
- package/runtime/delivery/codec.ts +50 -0
- package/runtime/delivery/compiler-dependency-pins.ts +1685 -0
- package/runtime/delivery/compiler-files.ts +181 -0
- package/runtime/delivery/compiler-io.ts +10 -0
- package/runtime/delivery/compiler-pins.ts +143 -0
- package/runtime/delivery/compiler.ts +701 -0
- package/runtime/delivery/config.ts +116 -0
- package/runtime/delivery/configuration-definition.ts +160 -0
- package/runtime/delivery/configuration-hre.ts +130 -0
- package/runtime/delivery/configuration-runtime.ts +163 -0
- package/runtime/delivery/configuration.ts +67 -0
- package/runtime/delivery/contract-source.ts +112 -0
- package/runtime/delivery/create2.ts +57 -0
- package/runtime/delivery/custom-closure.ts +993 -0
- package/runtime/delivery/custom-format.ts +479 -0
- package/runtime/delivery/custom.ts +219 -0
- package/runtime/delivery/data.ts +94 -0
- package/runtime/delivery/development.ts +264 -0
- package/runtime/delivery/engine.ts +29 -0
- package/runtime/delivery/eoa-observation.ts +106 -0
- package/runtime/delivery/eoa-signed.ts +55 -0
- package/runtime/delivery/eoa.ts +288 -0
- package/runtime/delivery/execution-db.ts +131 -0
- package/runtime/delivery/execution-files.ts +135 -0
- package/runtime/delivery/execution-identity.ts +32 -0
- package/runtime/delivery/execution-model.ts +102 -0
- package/runtime/delivery/execution-store.ts +411 -0
- package/runtime/delivery/existing-code.ts +45 -0
- package/runtime/delivery/export.ts +99 -0
- package/runtime/delivery/forkAudit.ts +620 -0
- package/runtime/delivery/hardhat.ts +38 -0
- package/runtime/delivery/history-registration.ts +10 -0
- package/runtime/delivery/identities.ts +132 -0
- package/runtime/delivery/input-files.ts +46 -0
- package/runtime/delivery/inputs.ts +204 -0
- package/runtime/delivery/journal.ts +205 -0
- package/runtime/delivery/manifest.ts +54 -0
- package/runtime/delivery/materialization.ts +53 -0
- package/runtime/delivery/observations.ts +60 -0
- package/runtime/delivery/parameter-defaults.ts +75 -0
- package/runtime/delivery/parameters.ts +367 -0
- package/runtime/delivery/pending.ts +98 -0
- package/runtime/delivery/plan.ts +337 -0
- package/runtime/delivery/planning.ts +411 -0
- package/runtime/delivery/policy.ts +9 -0
- package/runtime/delivery/preparation.ts +240 -0
- package/runtime/delivery/production-environment.ts +7 -0
- package/runtime/delivery/production-finalization.ts +181 -0
- package/runtime/delivery/production-intent.ts +14 -0
- package/runtime/delivery/production.ts +415 -0
- package/runtime/delivery/project-files.ts +63 -0
- package/runtime/delivery/project-rpc.ts +116 -0
- package/runtime/delivery/project.ts +129 -0
- package/runtime/delivery/protocol.ts +94 -0
- package/runtime/delivery/public-calldata.ts +74 -0
- package/runtime/delivery/references.ts +106 -0
- package/runtime/delivery/release-graph.ts +79 -0
- package/runtime/delivery/release-history-capture.ts +32 -0
- package/runtime/delivery/release-history.ts +178 -0
- package/runtime/delivery/release-inputs.ts +107 -0
- package/runtime/delivery/release.ts +166 -0
- package/runtime/delivery/safe-manifest.ts +11 -0
- package/runtime/delivery/safe-observation.ts +626 -0
- package/runtime/delivery/safe-prepare.ts +101 -0
- package/runtime/delivery/safe.ts +355 -0
- package/runtime/delivery/same-fork-baseline.ts +17 -0
- package/runtime/delivery/setup.ts +184 -0
- package/runtime/delivery/source.ts +130 -0
- package/runtime/delivery/target-fields.ts +7 -0
- package/runtime/delivery/task-identity.ts +85 -0
- package/runtime/delivery/toolchain.ts +48 -0
- package/runtime/delivery/validation.ts +252 -0
- package/runtime/delivery/verification.ts +47 -0
- package/runtime/migrate.ts +1 -0
- package/runtime/miner/binary.ts +41 -0
- package/runtime/miner/cli.ts +87 -0
- package/runtime/miner/index.ts +5 -0
- package/runtime/miner/request.ts +54 -0
- package/runtime/miner/runner.ts +90 -0
- package/runtime/miner/types.ts +71 -0
- package/runtime/miner/verify.ts +61 -0
- package/runtime/vendor/plan-codec/index.cjs +897 -0
- package/runtime/vendor/plan-codec/index.d.cts +38 -0
- package/runtime/vendor/plan-codec/provenance.json +25 -0
- package/runtime/workflow/engine.ts +174 -0
- package/runtime/workflow/lib/authority.ts +3 -3
- package/runtime/workflow/lib/calls.ts +47 -37
- package/runtime/workflow/lib/canonicalData.ts +45 -0
- package/runtime/workflow/lib/checkCodeRunner.ts +7 -3
- package/runtime/workflow/lib/config.ts +1 -1
- package/runtime/workflow/lib/context.ts +77 -0
- package/runtime/workflow/lib/create2.ts +18 -121
- package/runtime/workflow/lib/deploymentInfo.ts +8 -0
- package/runtime/workflow/lib/deploymentRecords.ts +3 -1
- package/runtime/workflow/lib/deployments.ts +6 -14
- package/runtime/workflow/lib/evidencePorts.ts +20 -0
- package/runtime/workflow/lib/executionPlan.ts +17 -268
- package/runtime/workflow/lib/externalExecutionScanner.ts +2 -1
- package/runtime/workflow/lib/gateTool.ts +22 -10
- package/runtime/workflow/lib/gateToolSync.ts +11 -3
- package/runtime/workflow/lib/operationNames.ts +32 -0
- package/runtime/workflow/lib/parameters.ts +8 -21
- package/runtime/workflow/lib/pendingDeploymentReuse.ts +4 -56
- package/runtime/workflow/lib/pendingUupsBinding.ts +43 -0
- package/runtime/workflow/lib/plan.ts +334 -0
- package/runtime/workflow/lib/planCli.ts +279 -0
- package/runtime/workflow/lib/preparationEvidence.ts +14 -0
- package/runtime/workflow/lib/proxy.ts +6 -3
- package/runtime/workflow/lib/runtime.ts +46 -0
- package/runtime/workflow/lib/signer.ts +8 -5
- package/runtime/workflow/lib/simulation.ts +41 -17
- package/runtime/workflow/lib/state.ts +3 -3
- package/runtime/workflow/lib/staticValidation.ts +92 -11
- package/runtime/workflow/lib/transactionPlanner.ts +314 -0
- package/runtime/workflow/lib/typedValue.ts +46 -0
- package/runtime/workflow/lib/validation.ts +50 -0
- package/runtime/workflow/planAdd.ts +8 -0
- package/runtime/workflow/planRead.ts +8 -0
- package/runtime/workflow/planStatus.ts +8 -0
- package/runtime/workflow/planWrite.ts +8 -0
- package/runtime/workflow/run.ts +42 -176
- package/runtime/workflow/staticValidate.ts +8 -3
- package/runtime/workflow/steps/call.ts +1 -1
- package/runtime/workflow/steps/check.ts +1 -1
- package/runtime/workflow/steps/custom.ts +1 -1
- package/runtime/workflow/steps/deploy.ts +99 -58
- package/runtime/workflow/steps/upgrade.ts +88 -57
- package/runtime/workflow/steps/view.ts +1 -1
- package/bin/workflow.cjs +0 -19
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { validateNetworkAlias } from '../../delivery/policy.js';
|
|
1
2
|
import crypto from 'node:crypto';
|
|
2
3
|
import fs from 'node:fs';
|
|
3
4
|
import path from 'node:path';
|
|
@@ -90,7 +91,7 @@ const canonicalValue = (raw, label) => {
|
|
|
90
91
|
}
|
|
91
92
|
if (raw && typeof raw === 'object') {
|
|
92
93
|
const value = raw;
|
|
93
|
-
const result =
|
|
94
|
+
const result = Object.create(null);
|
|
94
95
|
for (const key of Object.keys(value).sort()) {
|
|
95
96
|
if (value[key] === undefined)
|
|
96
97
|
throw new Error(`${label}.${key} must be JSON-safe`);
|
|
@@ -115,7 +116,9 @@ const scheme = (raw) => {
|
|
|
115
116
|
const kind = (raw) => {
|
|
116
117
|
if (raw !== 'create2-deploy'
|
|
117
118
|
&& raw !== 'uups-placeholder-deploy'
|
|
118
|
-
&& raw !== 'uups-upgrade'
|
|
119
|
+
&& raw !== 'uups-upgrade'
|
|
120
|
+
&& raw !== 'transparent-deploy'
|
|
121
|
+
&& raw !== 'transparent-upgrade') {
|
|
119
122
|
throw new Error('preparation kind is invalid');
|
|
120
123
|
}
|
|
121
124
|
return raw;
|
|
@@ -155,6 +158,9 @@ const unsafeAllow = (raw) => {
|
|
|
155
158
|
};
|
|
156
159
|
export const normalizePreparationRequest = (raw) => {
|
|
157
160
|
const value = record(raw, 'preparation request');
|
|
161
|
+
if ('create2Factory' in value || 'postDeployCalls' in value || 'transferOwnership' in value) {
|
|
162
|
+
throw new Error('OpenZeppelin private deployment options are unsupported; use prepareWorkflow and explicit planned calls');
|
|
163
|
+
}
|
|
158
164
|
const selectedKind = kind(value.kind);
|
|
159
165
|
const commonRequired = [
|
|
160
166
|
'version', 'kind', 'network', 'target', 'contract', 'constructorArgs', 'factory',
|
|
@@ -165,6 +171,10 @@ export const normalizePreparationRequest = (raw) => {
|
|
|
165
171
|
...commonOptional, 'create2ForwardValue', 'callForwardValue', 'addressPolicy',
|
|
166
172
|
], 'preparation request');
|
|
167
173
|
}
|
|
174
|
+
else if (selectedKind === 'transparent-deploy' || selectedKind === 'transparent-upgrade') {
|
|
175
|
+
exactKeys(value, [...commonRequired, 'proxyKind', 'implementationSalt', 'proxyAdminOwner',
|
|
176
|
+
...(selectedKind === 'transparent-deploy' ? ['proxySalt'] : ['proxy', 'proxyAdmin'])], [...commonOptional, 'unsafeAllow', 'call', selectedKind === 'transparent-deploy' ? 'proxyAddressPolicy' : 'implementationAddressPolicy'], 'preparation request');
|
|
177
|
+
}
|
|
168
178
|
else if (selectedKind === 'uups-placeholder-deploy') {
|
|
169
179
|
exactKeys(value, [
|
|
170
180
|
...commonRequired, 'proxyKind', 'implementationSalt', 'proxySalt', 'placeholderImplementation',
|
|
@@ -180,8 +190,8 @@ export const normalizePreparationRequest = (raw) => {
|
|
|
180
190
|
const common = {
|
|
181
191
|
version: 1,
|
|
182
192
|
scheme: scheme(value.scheme),
|
|
183
|
-
network:
|
|
184
|
-
target:
|
|
193
|
+
network: validateNetworkAlias(value.network, 'network'),
|
|
194
|
+
target: validateNetworkAlias(value.target, 'target'),
|
|
185
195
|
contract: nonEmptyString(value.contract, 'contract'),
|
|
186
196
|
constructorArgs: canonicalArray(value.constructorArgs, 'constructorArgs'),
|
|
187
197
|
factory: address(value.factory, 'factory'),
|
|
@@ -202,6 +212,22 @@ export const normalizePreparationRequest = (raw) => {
|
|
|
202
212
|
}),
|
|
203
213
|
};
|
|
204
214
|
}
|
|
215
|
+
if (selectedKind === 'transparent-deploy' || selectedKind === 'transparent-upgrade') {
|
|
216
|
+
if (value.proxyKind !== 'transparent')
|
|
217
|
+
throw new Error('proxyKind must be transparent');
|
|
218
|
+
if (common.scheme !== 'evm')
|
|
219
|
+
throw new Error('Transparent preparation requires ordinary EVM');
|
|
220
|
+
const transparent = { ...common, scheme: 'evm', proxyKind: 'transparent',
|
|
221
|
+
implementationSalt: salt(value.implementationSalt, 'implementationSalt'),
|
|
222
|
+
proxyAdminOwner: address(value.proxyAdminOwner, 'proxyAdminOwner'),
|
|
223
|
+
...(value.unsafeAllow === undefined ? {} : { unsafeAllow: unsafeAllow(value.unsafeAllow) }),
|
|
224
|
+
...(value.call === undefined ? {} : { call: call(value.call, 'call') }) };
|
|
225
|
+
return selectedKind === 'transparent-deploy' ? { ...transparent, kind: selectedKind,
|
|
226
|
+
proxySalt: salt(value.proxySalt, 'proxySalt'),
|
|
227
|
+
...(value.proxyAddressPolicy === undefined ? {} : { proxyAddressPolicy: addressPolicy(value.proxyAddressPolicy, 'proxyAddressPolicy') }) }
|
|
228
|
+
: { ...transparent, kind: selectedKind, proxy: address(value.proxy, 'proxy'), proxyAdmin: address(value.proxyAdmin, 'proxyAdmin'),
|
|
229
|
+
...(value.implementationAddressPolicy === undefined ? {} : { implementationAddressPolicy: addressPolicy(value.implementationAddressPolicy, 'implementationAddressPolicy') }) };
|
|
230
|
+
}
|
|
205
231
|
if (value.proxyKind !== 'uups')
|
|
206
232
|
throw new Error('proxyKind must be uups');
|
|
207
233
|
const uups = {
|
|
@@ -237,7 +263,7 @@ const canonicalJsonValue = (raw) => {
|
|
|
237
263
|
return raw.map(canonicalJsonValue);
|
|
238
264
|
if (raw && typeof raw === 'object') {
|
|
239
265
|
const value = raw;
|
|
240
|
-
const result =
|
|
266
|
+
const result = Object.create(null);
|
|
241
267
|
for (const key of Object.keys(value).sort())
|
|
242
268
|
result[key] = canonicalJsonValue(value[key]);
|
|
243
269
|
return result;
|
|
@@ -279,16 +305,19 @@ const normalizeValidation = (raw, selectedKind, selectedScheme) => {
|
|
|
279
305
|
}
|
|
280
306
|
return { kind: 'artifact', engine: 'hardhat-artifact', artifactFormat: format };
|
|
281
307
|
}
|
|
308
|
+
if (selectedKind.startsWith('transparent-') && selectedScheme !== 'evm')
|
|
309
|
+
throw new Error('Transparent preparation requires ordinary EVM');
|
|
282
310
|
const expectedEngine = selectedScheme === 'evm' ? 'openzeppelin' : 'matterlabs-openzeppelin';
|
|
283
|
-
if (selectedKind === 'uups-placeholder-deploy') {
|
|
311
|
+
if (selectedKind === 'uups-placeholder-deploy' || selectedKind === 'transparent-deploy') {
|
|
312
|
+
const initialKind = selectedKind === 'transparent-deploy' ? 'transparent-initial' : 'uups-initial';
|
|
284
313
|
exactKeys(value, ['kind', 'engine', 'artifactFormat', 'implementationSafe'], [], 'validation');
|
|
285
|
-
if (value.kind !==
|
|
314
|
+
if (value.kind !== initialKind
|
|
286
315
|
|| value.engine !== expectedEngine
|
|
287
316
|
|| value.implementationSafe !== true) {
|
|
288
317
|
throw new Error('uups-placeholder-deploy requires implementation safety validation');
|
|
289
318
|
}
|
|
290
319
|
return {
|
|
291
|
-
kind:
|
|
320
|
+
kind: initialKind,
|
|
292
321
|
engine: expectedEngine,
|
|
293
322
|
artifactFormat: format,
|
|
294
323
|
implementationSafe: true,
|
|
@@ -296,16 +325,19 @@ const normalizeValidation = (raw, selectedKind, selectedScheme) => {
|
|
|
296
325
|
}
|
|
297
326
|
exactKeys(value, [
|
|
298
327
|
'kind', 'engine', 'artifactFormat', 'implementationSafe', 'storageLayoutCompatible',
|
|
299
|
-
'currentImplementation', 'oldLayoutHash', 'newLayoutHash',
|
|
300
|
-
], [], 'validation');
|
|
301
|
-
if (value.
|
|
328
|
+
'currentImplementation', 'oldLayoutHash', 'newLayoutHash',
|
|
329
|
+
], ['manifestDigest', 'sameForkBaselineDigest'], 'validation');
|
|
330
|
+
if (Object.hasOwn(value, 'manifestDigest') === Object.hasOwn(value, 'sameForkBaselineDigest')
|
|
331
|
+
|| (Object.hasOwn(value, 'sameForkBaselineDigest') && selectedScheme !== 'evm'))
|
|
332
|
+
throw new Error('Upgrade validation requires exactly one supported baseline kind');
|
|
333
|
+
if (value.kind !== selectedKind
|
|
302
334
|
|| value.engine !== expectedEngine
|
|
303
335
|
|| value.implementationSafe !== true
|
|
304
336
|
|| value.storageLayoutCompatible !== true) {
|
|
305
337
|
throw new Error('uups-upgrade requires storage compatibility validation');
|
|
306
338
|
}
|
|
307
339
|
return {
|
|
308
|
-
kind:
|
|
340
|
+
kind: selectedKind,
|
|
309
341
|
engine: expectedEngine,
|
|
310
342
|
artifactFormat: format,
|
|
311
343
|
implementationSafe: true,
|
|
@@ -313,7 +345,8 @@ const normalizeValidation = (raw, selectedKind, selectedScheme) => {
|
|
|
313
345
|
currentImplementation: address(value.currentImplementation, 'validation.currentImplementation'),
|
|
314
346
|
oldLayoutHash: digest(value.oldLayoutHash, 'validation.oldLayoutHash'),
|
|
315
347
|
newLayoutHash: digest(value.newLayoutHash, 'validation.newLayoutHash'),
|
|
316
|
-
manifestDigest: digest(value.manifestDigest, 'validation.manifestDigest')
|
|
348
|
+
...(Object.hasOwn(value, 'manifestDigest') ? { manifestDigest: digest(value.manifestDigest, 'validation.manifestDigest') }
|
|
349
|
+
: { sameForkBaselineDigest: digest(value.sameForkBaselineDigest, 'validation.sameForkBaselineDigest') }),
|
|
317
350
|
};
|
|
318
351
|
};
|
|
319
352
|
const normalizeDeployment = (raw, index, selectedScheme) => {
|
|
@@ -410,7 +443,7 @@ const assertRoleShape = (selectedKind, deployments) => {
|
|
|
410
443
|
const roles = deployments.map((deployment) => deployment.role).join(',');
|
|
411
444
|
const expected = selectedKind === 'create2-deploy'
|
|
412
445
|
? 'contract'
|
|
413
|
-
: selectedKind === 'uups-placeholder-deploy'
|
|
446
|
+
: selectedKind === 'uups-placeholder-deploy' || selectedKind === 'transparent-deploy'
|
|
414
447
|
? 'implementation,proxy'
|
|
415
448
|
: 'implementation';
|
|
416
449
|
if (roles !== expected)
|
|
@@ -421,18 +454,31 @@ export const normalizePreparationPlan = (raw) => {
|
|
|
421
454
|
exactKeys(value, [
|
|
422
455
|
'version', 'requestHash', 'kind', 'scheme', 'network', 'target', 'chainId',
|
|
423
456
|
'contract', 'artifact', 'validation', 'deployments', 'transactions',
|
|
424
|
-
], ['proxyKind'], 'preparation plan');
|
|
457
|
+
], ['proxyKind', 'proxyAdmin'], 'preparation plan');
|
|
425
458
|
if (value.version !== 1)
|
|
426
459
|
throw new Error('preparation plan version must be 1');
|
|
460
|
+
if ('create2Factory' in value || 'postDeployCalls' in value || 'transferOwnership' in value) {
|
|
461
|
+
throw new Error('OpenZeppelin private deployment options are unsupported; use prepareWorkflow and explicit planned calls');
|
|
462
|
+
}
|
|
427
463
|
const selectedKind = kind(value.kind);
|
|
428
464
|
const selectedScheme = scheme(value.scheme);
|
|
429
465
|
if (selectedKind === 'create2-deploy') {
|
|
430
466
|
if (value.proxyKind !== undefined)
|
|
431
467
|
throw new Error('create2-deploy must not contain proxyKind');
|
|
432
468
|
}
|
|
433
|
-
else if (value.proxyKind !== 'uups') {
|
|
434
|
-
throw new Error(`${selectedKind}
|
|
469
|
+
else if (value.proxyKind !== (selectedKind.startsWith('transparent-') ? 'transparent' : 'uups')) {
|
|
470
|
+
throw new Error(`${selectedKind} has mismatched proxyKind`);
|
|
471
|
+
}
|
|
472
|
+
let proxyAdmin;
|
|
473
|
+
if (selectedKind.startsWith('transparent-')) {
|
|
474
|
+
if (selectedScheme !== 'evm')
|
|
475
|
+
throw new Error('Transparent preparation requires ordinary EVM');
|
|
476
|
+
const admin = record(value.proxyAdmin, 'proxyAdmin');
|
|
477
|
+
exactKeys(admin, ['address', 'owner'], [], 'proxyAdmin');
|
|
478
|
+
proxyAdmin = { address: address(admin.address, 'proxyAdmin.address'), owner: address(admin.owner, 'proxyAdmin.owner') };
|
|
435
479
|
}
|
|
480
|
+
else if (value.proxyAdmin !== undefined)
|
|
481
|
+
throw new Error('Unexpected ProxyAdmin on non-transparent plan');
|
|
436
482
|
if (!Array.isArray(value.deployments))
|
|
437
483
|
throw new Error('deployments must be an array');
|
|
438
484
|
if (!Array.isArray(value.transactions))
|
|
@@ -451,11 +497,12 @@ export const normalizePreparationPlan = (raw) => {
|
|
|
451
497
|
requestHash: digest(value.requestHash, 'requestHash'),
|
|
452
498
|
kind: selectedKind,
|
|
453
499
|
scheme: selectedScheme,
|
|
454
|
-
network:
|
|
455
|
-
target:
|
|
500
|
+
network: validateNetworkAlias(value.network, 'network'),
|
|
501
|
+
target: validateNetworkAlias(value.target, 'target'),
|
|
456
502
|
chainId: integerString(value.chainId, 'chainId'),
|
|
457
503
|
contract: nonEmptyString(value.contract, 'contract'),
|
|
458
|
-
...(selectedKind === 'create2-deploy' ? {} : { proxyKind: 'uups' }),
|
|
504
|
+
...(selectedKind === 'create2-deploy' ? {} : { proxyKind: selectedKind.startsWith('transparent-') ? 'transparent' : 'uups' }),
|
|
505
|
+
...(proxyAdmin ? { proxyAdmin } : {}),
|
|
459
506
|
artifact: normalizeArtifact(value.artifact),
|
|
460
507
|
validation: normalizeValidation(value.validation, selectedKind, selectedScheme),
|
|
461
508
|
deployments,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize.js","sourceRoot":"","sources":["../../../src/core/preparation/normalize.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"normalize.js","sourceRoot":"","sources":["../../../src/core/preparation/normalize.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { Interface } from 'ethers';
|
|
2
|
+
import { type GateToolArtifact } from './artifacts.js';
|
|
3
|
+
import { type EvmPreparationHre, type EvmPreparationDependencies } from './evm.js';
|
|
4
|
+
import type { GateToolNormalizedTransparentDeployRequestV1, GateToolNormalizedTransparentUpgradeRequestV1, GateToolPreparationPlanV1 } from './types.js';
|
|
5
|
+
export declare const TRANSPARENT_PROXY_ARTIFACT = "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol:TransparentUpgradeableProxy";
|
|
6
|
+
export declare const PROXY_ADMIN_ARTIFACT = "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol:ProxyAdmin";
|
|
7
|
+
export declare const ERC1967_ADMIN_SLOT = "0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
|
|
8
|
+
export declare const PROXY_ADMIN_INTERFACE: Interface;
|
|
9
|
+
export declare function transparentAdminAddress(proxy: string): string;
|
|
10
|
+
/** OZ 5's immutable admin must agree with the slot; masking immutables alone is insufficient. */
|
|
11
|
+
export declare function assertTransparentAdminImmutable(code: string, references: Record<string, Array<{
|
|
12
|
+
start: number;
|
|
13
|
+
length: number;
|
|
14
|
+
}>>, admin: string): void;
|
|
15
|
+
export declare function verifyTransparentAdmin(input: {
|
|
16
|
+
hre: EvmPreparationHre;
|
|
17
|
+
proxy: string;
|
|
18
|
+
admin: string;
|
|
19
|
+
owner: string;
|
|
20
|
+
readArtifact?: (name: string) => Promise<GateToolArtifact>;
|
|
21
|
+
}): Promise<void>;
|
|
22
|
+
export declare function prepareTransparent(hre: EvmPreparationHre, request: GateToolNormalizedTransparentDeployRequestV1 | GateToolNormalizedTransparentUpgradeRequestV1, artifact: GateToolArtifact, dependencies: EvmPreparationDependencies): Promise<GateToolPreparationPlanV1>;
|
|
23
|
+
//# sourceMappingURL=transparent.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"transparent.d.ts","sourceRoot":"","sources":["../../../src/core/preparation/transparent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiD,SAAS,EAAiB,MAAM,QAAQ,CAAC;AAKjG,OAAO,EAAoB,KAAK,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAA0D,KAAK,iBAAiB,EAAE,KAAK,0BAA0B,EAAE,MAAM,UAAU,CAAC;AAE3I,OAAO,KAAK,EAAE,4CAA4C,EAAE,6CAA6C,EAAE,yBAAyB,EAA2B,MAAM,YAAY,CAAC;AAElL,eAAO,MAAM,0BAA0B,0GAA0G,CAAC;AAClJ,eAAO,MAAM,oBAAoB,wEAAwE,CAAC;AAC1G,eAAO,MAAM,kBAAkB,uEAAuE,CAAC;AACvG,eAAO,MAAM,qBAAqB,WAIhC,CAAC;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE7D;AACD,iGAAiG;AACjG,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC;IAAC,KAAK,EAAC,MAAM,CAAC;IAAA,MAAM,EAAC,MAAM,CAAA;CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAKlJ;AACD,wBAAsB,sBAAsB,CAAC,KAAK,EAAC;IACjD,GAAG,EAAE,iBAAiB,CAAC;IAAC,KAAK,EAAC,MAAM,CAAC;IAAC,KAAK,EAAC,MAAM,CAAC;IAAC,KAAK,EAAC,MAAM,CAAC;IACjE,YAAY,CAAC,EAAC,CAAC,IAAI,EAAC,MAAM,KAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;CACxD,GAAE,OAAO,CAAC,IAAI,CAAC,CAiBf;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAC,iBAAiB,EAAC,OAAO,EAAC,4CAA4C,GAAC,6CAA6C,EAAC,QAAQ,EAAC,gBAAgB,EAAC,YAAY,EAAC,0BAA0B,GAAE,OAAO,CAAC,yBAAyB,CAAC,CAuCtQ"}
|
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
import { ContractFactory, getAddress, getCreateAddress, Interface } from 'ethers';
|
|
2
|
+
import { getDeployData } from '@openzeppelin/hardhat-upgrades/dist/utils/deploy-impl.js';
|
|
3
|
+
import { assertUpgradeSafe } from '@openzeppelin/upgrades-core';
|
|
4
|
+
import { BytecodeChecker } from '../BytecodeChecker.js';
|
|
5
|
+
import { artifactIdentity } from './artifacts.js';
|
|
6
|
+
import { buildDeployment, validateUpgradeAndLoadDefaultEvidence } from './evm.js';
|
|
7
|
+
import { hashPreparationRequest, normalizePreparationPlan } from './normalize.js';
|
|
8
|
+
export const TRANSPARENT_PROXY_ARTIFACT = '@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol:TransparentUpgradeableProxy';
|
|
9
|
+
export const PROXY_ADMIN_ARTIFACT = '@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol:ProxyAdmin';
|
|
10
|
+
export const ERC1967_ADMIN_SLOT = '0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103';
|
|
11
|
+
export const PROXY_ADMIN_INTERFACE = new Interface([
|
|
12
|
+
'function owner() view returns(address)',
|
|
13
|
+
'function UPGRADE_INTERFACE_VERSION() view returns(string)',
|
|
14
|
+
'function upgradeAndCall(address proxy,address implementation,bytes data) payable',
|
|
15
|
+
]);
|
|
16
|
+
export function transparentAdminAddress(proxy) {
|
|
17
|
+
return getCreateAddress({ from: getAddress(proxy), nonce: 1 }).toLowerCase();
|
|
18
|
+
}
|
|
19
|
+
/** OZ 5's immutable admin must agree with the slot; masking immutables alone is insufficient. */
|
|
20
|
+
export function assertTransparentAdminImmutable(code, references, admin) {
|
|
21
|
+
const fields = Object.values(references);
|
|
22
|
+
if (fields.length !== 1 || !fields[0].length)
|
|
23
|
+
throw Error('Unsupported Transparent proxy admin immutable layout');
|
|
24
|
+
const expected = getAddress(admin).slice(2).toLowerCase().padStart(64, '0');
|
|
25
|
+
for (const ref of fields[0])
|
|
26
|
+
if (ref.length !== 32 || code.slice(2 + ref.start * 2, 2 + (ref.start + ref.length) * 2).toLowerCase() !== expected)
|
|
27
|
+
throw Error('Transparent proxy immutable admin mismatch');
|
|
28
|
+
}
|
|
29
|
+
export async function verifyTransparentAdmin(input) {
|
|
30
|
+
const { hre } = input, provider = hre.ethers.provider;
|
|
31
|
+
const admin = getAddress(input.admin).toLowerCase();
|
|
32
|
+
if (admin !== transparentAdminAddress(input.proxy))
|
|
33
|
+
throw Error('Transparent ProxyAdmin CREATE address mismatch');
|
|
34
|
+
const slot = await provider.getStorage(input.proxy, ERC1967_ADMIN_SLOT, 'latest');
|
|
35
|
+
if (!/^0x0{24}[a-fA-F0-9]{40}$/.test(slot) || `0x${slot.slice(-40)}`.toLowerCase() !== admin)
|
|
36
|
+
throw Error('Transparent ERC-1967 admin mismatch');
|
|
37
|
+
const checker = new BytecodeChecker(hre, {}, 'evm');
|
|
38
|
+
for (const name of [TRANSPARENT_PROXY_ARTIFACT, PROXY_ADMIN_ARTIFACT]) {
|
|
39
|
+
const artifact = await (input.readArtifact ?? hre.artifacts.readArtifact.bind(hre.artifacts))(name);
|
|
40
|
+
const local = await checker.getLocalBytecode(name), address = name === PROXY_ADMIN_ARTIFACT ? admin : input.proxy;
|
|
41
|
+
const code = await provider.getCode(address, 'latest');
|
|
42
|
+
if (!code || code === '0x' || !checker.compareBytecode(code, artifact.deployedBytecode, artifact.abi, local.immutableReferences).matches)
|
|
43
|
+
throw Error('Transparent proxy/ProxyAdmin runtime mismatch');
|
|
44
|
+
if (name === TRANSPARENT_PROXY_ARTIFACT)
|
|
45
|
+
assertTransparentAdminImmutable(code, local.immutableReferences ?? {}, admin);
|
|
46
|
+
}
|
|
47
|
+
const owner = PROXY_ADMIN_INTERFACE.decodeFunctionResult('owner', await provider.call({ to: admin, data: PROXY_ADMIN_INTERFACE.encodeFunctionData('owner'), blockTag: 'latest' }))[0];
|
|
48
|
+
const version = PROXY_ADMIN_INTERFACE.decodeFunctionResult('UPGRADE_INTERFACE_VERSION', await provider.call({ to: admin, data: PROXY_ADMIN_INTERFACE.encodeFunctionData('UPGRADE_INTERFACE_VERSION'), blockTag: 'latest' }))[0];
|
|
49
|
+
if (getAddress(owner) !== getAddress(input.owner) || version !== '5.0.0')
|
|
50
|
+
throw Error('Transparent ProxyAdmin owner/version mismatch');
|
|
51
|
+
}
|
|
52
|
+
export async function prepareTransparent(hre, request, artifact, dependencies) {
|
|
53
|
+
const factory = new ContractFactory(artifact.abi, artifact.bytecode), options = { kind: 'transparent', constructorArgs: request.constructorArgs, ...(request.unsafeAllow ? { unsafeAllow: request.unsafeAllow } : {}) };
|
|
54
|
+
const read = async (name) => { const a = await hre.artifacts.readArtifact(name); return dependencies.validation?.artifact(name, a) ?? a; };
|
|
55
|
+
let validation;
|
|
56
|
+
if (request.kind === 'transparent-upgrade') {
|
|
57
|
+
await verifyTransparentAdmin({ hre, proxy: request.proxy, admin: request.proxyAdmin, owner: request.proxyAdminOwner, readArtifact: read });
|
|
58
|
+
const evidence = await (dependencies.loadUpgradeEvidence ?? validateUpgradeAndLoadDefaultEvidence)(hre, request, factory, options, { validation: dependencies.validation, artifact });
|
|
59
|
+
validation = { kind: 'transparent-upgrade', engine: 'openzeppelin', artifactFormat: 'hh-sol-artifact-1', implementationSafe: true, storageLayoutCompatible: true, ...evidence };
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
if (dependencies.validation?.deployData) {
|
|
63
|
+
const data = await getDeployData(hre, factory, options);
|
|
64
|
+
assertUpgradeSafe(data.validations, data.version, data.fullOpts);
|
|
65
|
+
await dependencies.validation.deployData({ artifact, factory, data, request, options });
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
if (!hre.upgrades?.validateImplementation)
|
|
69
|
+
throw Error('OpenZeppelin validateImplementation is required for Transparent preparation');
|
|
70
|
+
await hre.upgrades.validateImplementation(factory, options);
|
|
71
|
+
}
|
|
72
|
+
validation = { kind: 'transparent-initial', engine: 'openzeppelin', artifactFormat: 'hh-sol-artifact-1', implementationSafe: true };
|
|
73
|
+
}
|
|
74
|
+
const implementation = await buildDeployment({ hre, validation: dependencies.validation, role: 'implementation', artifact, constructorArgs: request.constructorArgs, factory: request.factory, salt: request.implementationSalt,
|
|
75
|
+
...(request.kind === 'transparent-upgrade' ? { policy: request.implementationAddressPolicy } : {}) });
|
|
76
|
+
if (request.call)
|
|
77
|
+
dependencies.validation?.arguments(artifact, request.call.method, request.call.args);
|
|
78
|
+
const data = request.call ? factory.interface.encodeFunctionData(request.call.method, request.call.args) : '0x';
|
|
79
|
+
const transactions = implementation.transaction ? [implementation.transaction] : [], deployments = [implementation.deployment];
|
|
80
|
+
let proxy;
|
|
81
|
+
if (request.kind === 'transparent-deploy') {
|
|
82
|
+
const prepared = await buildDeployment({ hre, validation: dependencies.validation, role: 'proxy', artifact: await read(TRANSPARENT_PROXY_ARTIFACT), constructorArgs: [implementation.deployment.address, request.proxyAdminOwner, data], factory: request.factory, salt: request.proxySalt, policy: request.proxyAddressPolicy });
|
|
83
|
+
proxy = prepared.deployment.address;
|
|
84
|
+
deployments.push(prepared.deployment);
|
|
85
|
+
await read(PROXY_ADMIN_ARTIFACT);
|
|
86
|
+
if (prepared.transaction)
|
|
87
|
+
transactions.push(prepared.transaction);
|
|
88
|
+
else {
|
|
89
|
+
if (implementation.deployment.status !== 'reused')
|
|
90
|
+
throw Error('Reused Transparent proxy implementation is missing');
|
|
91
|
+
const current = await hre.upgrades?.erc1967?.getImplementationAddress(proxy);
|
|
92
|
+
if (current?.toLowerCase() !== implementation.deployment.address.toLowerCase())
|
|
93
|
+
throw Error('Reused Transparent implementation mismatch');
|
|
94
|
+
await verifyTransparentAdmin({ hre, proxy, admin: transparentAdminAddress(proxy), owner: request.proxyAdminOwner, readArtifact: read });
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
proxy = request.proxy;
|
|
99
|
+
transactions.push({ id: 'upgrade-proxy', purpose: 'upgrade-proxy', to: request.proxyAdmin, value: '0', operation: 0, data: PROXY_ADMIN_INTERFACE.encodeFunctionData('upgradeAndCall', [proxy, implementation.deployment.address, data]) });
|
|
100
|
+
}
|
|
101
|
+
return normalizePreparationPlan({ version: 1, requestHash: hashPreparationRequest(request), kind: request.kind, scheme: 'evm', network: request.network, target: request.target, chainId: String((await hre.ethers.provider.getNetwork()).chainId), contract: request.contract, proxyKind: 'transparent', proxyAdmin: { address: transparentAdminAddress(proxy), owner: request.proxyAdminOwner }, artifact: artifactIdentity(artifact, 'evm'), validation, deployments, transactions });
|
|
102
|
+
}
|
|
103
|
+
//# sourceMappingURL=transparent.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"transparent.js","sourceRoot":"","sources":["../../../src/core/preparation/transparent.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export type GateToolScheme = 'evm' | 'zksync-eravm';
|
|
2
|
-
export type GateToolPreparationKind = 'create2-deploy' | 'uups-placeholder-deploy' | 'uups-upgrade';
|
|
2
|
+
export type GateToolPreparationKind = 'create2-deploy' | 'uups-placeholder-deploy' | 'uups-upgrade' | 'transparent-deploy' | 'transparent-upgrade';
|
|
3
3
|
export interface GateToolAddressPolicy {
|
|
4
4
|
expectedAddress?: string;
|
|
5
5
|
leadingZeroBytes?: number;
|
|
@@ -44,7 +44,32 @@ export interface GateToolUupsUpgradeRequestV1 extends GateToolUupsRequestBaseV1
|
|
|
44
44
|
implementationAddressPolicy?: GateToolAddressPolicy;
|
|
45
45
|
call?: GateToolCallV1;
|
|
46
46
|
}
|
|
47
|
-
export
|
|
47
|
+
export interface GateToolTransparentRequestBaseV1 extends GateToolPreparationRequestCommonV1 {
|
|
48
|
+
proxyKind: 'transparent';
|
|
49
|
+
implementationSalt: string;
|
|
50
|
+
proxyAdminOwner: string;
|
|
51
|
+
unsafeAllow?: string[];
|
|
52
|
+
call?: GateToolCallV1;
|
|
53
|
+
}
|
|
54
|
+
export interface GateToolTransparentDeployRequestV1 extends GateToolTransparentRequestBaseV1 {
|
|
55
|
+
kind: 'transparent-deploy';
|
|
56
|
+
proxySalt: string;
|
|
57
|
+
proxyAddressPolicy?: GateToolAddressPolicy;
|
|
58
|
+
}
|
|
59
|
+
export interface GateToolTransparentUpgradeRequestV1 extends GateToolTransparentRequestBaseV1 {
|
|
60
|
+
kind: 'transparent-upgrade';
|
|
61
|
+
proxy: string;
|
|
62
|
+
proxyAdmin: string;
|
|
63
|
+
implementationAddressPolicy?: GateToolAddressPolicy;
|
|
64
|
+
}
|
|
65
|
+
export type GateToolNormalizedTransparentDeployRequestV1 = Omit<GateToolTransparentDeployRequestV1, 'scheme'> & {
|
|
66
|
+
scheme: 'evm';
|
|
67
|
+
};
|
|
68
|
+
export type GateToolNormalizedTransparentUpgradeRequestV1 = Omit<GateToolTransparentUpgradeRequestV1, 'scheme'> & {
|
|
69
|
+
scheme: 'evm';
|
|
70
|
+
};
|
|
71
|
+
export type GateToolNormalizedProxyUpgradeRequestV1 = GateToolNormalizedUupsUpgradeRequestV1 | GateToolNormalizedTransparentUpgradeRequestV1;
|
|
72
|
+
export type GateToolPreparationRequestV1 = GateToolCreate2DeployRequestV1 | GateToolUupsPlaceholderDeployRequestV1 | GateToolUupsUpgradeRequestV1 | GateToolTransparentDeployRequestV1 | GateToolTransparentUpgradeRequestV1;
|
|
48
73
|
export type GateToolNormalizedCreate2DeployRequestV1 = Omit<GateToolCreate2DeployRequestV1, 'scheme'> & {
|
|
49
74
|
scheme: GateToolScheme;
|
|
50
75
|
};
|
|
@@ -54,7 +79,7 @@ export type GateToolNormalizedUupsPlaceholderDeployRequestV1 = Omit<GateToolUups
|
|
|
54
79
|
export type GateToolNormalizedUupsUpgradeRequestV1 = Omit<GateToolUupsUpgradeRequestV1, 'scheme'> & {
|
|
55
80
|
scheme: GateToolScheme;
|
|
56
81
|
};
|
|
57
|
-
export type GateToolNormalizedPreparationRequestV1 = GateToolNormalizedCreate2DeployRequestV1 | GateToolNormalizedUupsPlaceholderDeployRequestV1 | GateToolNormalizedUupsUpgradeRequestV1;
|
|
82
|
+
export type GateToolNormalizedPreparationRequestV1 = GateToolNormalizedCreate2DeployRequestV1 | GateToolNormalizedUupsPlaceholderDeployRequestV1 | GateToolNormalizedUupsUpgradeRequestV1 | GateToolNormalizedTransparentDeployRequestV1 | GateToolNormalizedTransparentUpgradeRequestV1;
|
|
58
83
|
export type GateToolTransactionPurpose = 'deploy-contract' | 'deploy-implementation' | 'deploy-proxy' | 'upgrade-proxy';
|
|
59
84
|
export interface GateToolTransactionPlan {
|
|
60
85
|
id: string;
|
|
@@ -77,7 +102,7 @@ export interface GateToolUupsInitialValidation {
|
|
|
77
102
|
artifactFormat: GateToolArtifactFormat;
|
|
78
103
|
implementationSafe: true;
|
|
79
104
|
}
|
|
80
|
-
export
|
|
105
|
+
export type GateToolUupsUpgradeValidation = {
|
|
81
106
|
kind: 'uups-upgrade';
|
|
82
107
|
engine: 'openzeppelin' | 'matterlabs-openzeppelin';
|
|
83
108
|
artifactFormat: GateToolArtifactFormat;
|
|
@@ -86,9 +111,27 @@ export interface GateToolUupsUpgradeValidation {
|
|
|
86
111
|
currentImplementation: string;
|
|
87
112
|
oldLayoutHash: string;
|
|
88
113
|
newLayoutHash: string;
|
|
114
|
+
} & ({
|
|
89
115
|
manifestDigest: string;
|
|
90
|
-
|
|
91
|
-
|
|
116
|
+
sameForkBaselineDigest?: never;
|
|
117
|
+
} | {
|
|
118
|
+
manifestDigest?: never;
|
|
119
|
+
sameForkBaselineDigest: string;
|
|
120
|
+
});
|
|
121
|
+
export type GateToolValidation = GateToolArtifactValidation | GateToolUupsInitialValidation | GateToolUupsUpgradeValidation | (Omit<GateToolUupsInitialValidation, 'kind' | 'engine'> & {
|
|
122
|
+
kind: 'transparent-initial';
|
|
123
|
+
engine: 'openzeppelin';
|
|
124
|
+
}) | (Omit<Extract<GateToolUupsUpgradeValidation, {
|
|
125
|
+
manifestDigest: string;
|
|
126
|
+
}>, 'kind' | 'engine'> & {
|
|
127
|
+
kind: 'transparent-upgrade';
|
|
128
|
+
engine: 'openzeppelin';
|
|
129
|
+
}) | (Omit<Extract<GateToolUupsUpgradeValidation, {
|
|
130
|
+
sameForkBaselineDigest: string;
|
|
131
|
+
}>, 'kind' | 'engine'> & {
|
|
132
|
+
kind: 'transparent-upgrade';
|
|
133
|
+
engine: 'openzeppelin';
|
|
134
|
+
});
|
|
92
135
|
export interface GateToolArtifactIdentity {
|
|
93
136
|
sourceName: string;
|
|
94
137
|
contractName: string;
|
|
@@ -113,7 +156,11 @@ export interface GateToolPreparationPlanV1 {
|
|
|
113
156
|
target: string;
|
|
114
157
|
chainId: string;
|
|
115
158
|
contract: string;
|
|
116
|
-
proxyKind?: 'uups';
|
|
159
|
+
proxyKind?: 'uups' | 'transparent';
|
|
160
|
+
proxyAdmin?: {
|
|
161
|
+
address: string;
|
|
162
|
+
owner: string;
|
|
163
|
+
};
|
|
117
164
|
artifact: GateToolArtifactIdentity;
|
|
118
165
|
validation: GateToolValidation;
|
|
119
166
|
deployments: GateToolDeploymentPlan[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/core/preparation/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,GAAG,KAAK,GAAG,cAAc,CAAC;AAEpD,MAAM,MAAM,uBAAuB,GAC/B,gBAAgB,GAChB,yBAAyB,GACzB,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/core/preparation/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zksync.d.ts","sourceRoot":"","sources":["../../../src/core/preparation/zksync.ts"],"names":[],"mappings":"AASA,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,gBAAgB,CAAC;AAKxB,OAAO,KAAK,EAGV,sCAAsC,EAItC,yBAAyB,EAE1B,MAAM,YAAY,CAAC;AACpB,OAAO,EAGL,KAAK,wBAAwB,EAC7B,KAAK,eAAe,EACrB,MAAM,0BAA0B,CAAC;AAiBlC,UAAU,gBAAiB,SAAQ,eAAe;IAChD,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,GAAG;QACpC,MAAM,CAAC,EAAE;YAAE,MAAM,CAAC,EAAE,OAAO,CAAC;YAAC,OAAO,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;KACjD,CAAC;IACF,SAAS,EAAE;QAAE,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;KAAE,CAAC;IACrE,MAAM,EAAE;QACN,QAAQ,EAAE;YACR,UAAU,IAAI,OAAO,CAAC;gBAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;aAAE,CAAC,CAAC;YAC7D,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;SAC3C,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,yBAAyB;IACxC,UAAU,CAAC,EAAE,wBAAwB,CAAC;CACvC;AAySD,eAAO,MAAM,aAAa,GACxB,KAAK,gBAAgB,EACrB,SAAS,sCAAsC,EAC/C,eAAc,yBAA8B,KAC3C,OAAO,CAAC,yBAAyB,
|
|
1
|
+
{"version":3,"file":"zksync.d.ts","sourceRoot":"","sources":["../../../src/core/preparation/zksync.ts"],"names":[],"mappings":"AASA,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,gBAAgB,CAAC;AAKxB,OAAO,KAAK,EAGV,sCAAsC,EAItC,yBAAyB,EAE1B,MAAM,YAAY,CAAC;AACpB,OAAO,EAGL,KAAK,wBAAwB,EAC7B,KAAK,eAAe,EACrB,MAAM,0BAA0B,CAAC;AAiBlC,UAAU,gBAAiB,SAAQ,eAAe;IAChD,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,GAAG;QACpC,MAAM,CAAC,EAAE;YAAE,MAAM,CAAC,EAAE,OAAO,CAAC;YAAC,OAAO,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;KACjD,CAAC;IACF,SAAS,EAAE;QAAE,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;KAAE,CAAC;IACrE,MAAM,EAAE;QACN,QAAQ,EAAE;YACR,UAAU,IAAI,OAAO,CAAC;gBAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;aAAE,CAAC,CAAC;YAC7D,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;SAC3C,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,yBAAyB;IACxC,UAAU,CAAC,EAAE,wBAAwB,CAAC;CACvC;AAySD,eAAO,MAAM,aAAa,GACxB,KAAK,gBAAgB,EACrB,SAAS,sCAAsC,EAC/C,eAAc,yBAA8B,KAC3C,OAAO,CAAC,yBAAyB,CAenC,CAAC"}
|
|
@@ -241,6 +241,8 @@ const prepareUupsUpgrade = async (hre, request, artifact, dependencies) => {
|
|
|
241
241
|
});
|
|
242
242
|
};
|
|
243
243
|
export const prepareZkSync = async (hre, request, dependencies = {}) => {
|
|
244
|
+
if (request.kind === 'transparent-deploy' || request.kind === 'transparent-upgrade')
|
|
245
|
+
throw new Error('Transparent preparation requires ordinary EVM');
|
|
244
246
|
if (request.scheme !== 'zksync-eravm') {
|
|
245
247
|
throw new Error('zkSync adapter received a non-zkSync request');
|
|
246
248
|
}
|