thirdweb 5.88.5 → 5.88.6-nightly-b182302f590e75c9881cebd0ca1cc8b1425d50b8-20250218000338
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/dist/cjs/contract/deployment/zksync/zkDeployDeterministic.js +5 -1
- package/dist/cjs/contract/deployment/zksync/zkDeployDeterministic.js.map +1 -1
- package/dist/cjs/utils/any-evm/compute-deployment-address.js +4 -1
- package/dist/cjs/utils/any-evm/compute-deployment-address.js.map +1 -1
- package/dist/cjs/utils/any-evm/compute-published-contract-deploy-info.js +1 -0
- package/dist/cjs/utils/any-evm/compute-published-contract-deploy-info.js.map +1 -1
- package/dist/cjs/utils/any-evm/get-init-bytecode-with-salt.js +3 -1
- package/dist/cjs/utils/any-evm/get-init-bytecode-with-salt.js.map +1 -1
- package/dist/cjs/utils/any-evm/zksync/computeDeploymentAddress.js +6 -1
- package/dist/cjs/utils/any-evm/zksync/computeDeploymentAddress.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/version.js.map +1 -1
- package/dist/esm/contract/deployment/zksync/zkDeployDeterministic.js +6 -2
- package/dist/esm/contract/deployment/zksync/zkDeployDeterministic.js.map +1 -1
- package/dist/esm/utils/any-evm/compute-deployment-address.js +4 -1
- package/dist/esm/utils/any-evm/compute-deployment-address.js.map +1 -1
- package/dist/esm/utils/any-evm/compute-published-contract-deploy-info.js +1 -0
- package/dist/esm/utils/any-evm/compute-published-contract-deploy-info.js.map +1 -1
- package/dist/esm/utils/any-evm/get-init-bytecode-with-salt.js +4 -2
- package/dist/esm/utils/any-evm/get-init-bytecode-with-salt.js.map +1 -1
- package/dist/esm/utils/any-evm/zksync/computeDeploymentAddress.js +6 -1
- package/dist/esm/utils/any-evm/zksync/computeDeploymentAddress.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/version.js.map +1 -1
- package/dist/types/contract/deployment/zksync/zkDeployDeterministic.d.ts.map +1 -1
- package/dist/types/utils/any-evm/compute-deployment-address.d.ts.map +1 -1
- package/dist/types/utils/any-evm/compute-published-contract-deploy-info.d.ts +3 -0
- package/dist/types/utils/any-evm/compute-published-contract-deploy-info.d.ts.map +1 -1
- package/dist/types/utils/any-evm/get-init-bytecode-with-salt.d.ts.map +1 -1
- package/dist/types/utils/any-evm/zksync/computeDeploymentAddress.d.ts +1 -1
- package/dist/types/utils/any-evm/zksync/computeDeploymentAddress.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/types/version.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/contract/deployment/deploy-deterministic.test.ts +45 -2
- package/src/contract/deployment/zksync/zkDeployDeterministic.ts +10 -2
- package/src/utils/any-evm/compute-deployment-address.ts +4 -1
- package/src/utils/any-evm/compute-published-contract-deploy-info.ts +1 -0
- package/src/utils/any-evm/get-init-bytecode-with-salt.ts +5 -2
- package/src/utils/any-evm/zksync/computeDeploymentAddress.ts +6 -2
- package/src/version.ts +1 -1
|
@@ -71,7 +71,11 @@ async function zkDeployContractDeterministic(options) {
|
|
|
71
71
|
client: options.client,
|
|
72
72
|
abi: (0, abitype_1.parseAbi)(constants_js_1.singletonFactoryAbi),
|
|
73
73
|
});
|
|
74
|
-
const salt = options?.salt
|
|
74
|
+
const salt = options?.salt
|
|
75
|
+
? (0, hex_js_1.isHex)(options.salt) && options.salt.length === 66
|
|
76
|
+
? options.salt
|
|
77
|
+
: (0, keccak_id_js_1.keccakId)(options.salt)
|
|
78
|
+
: (0, keccak_id_js_1.keccakId)("thirdweb");
|
|
75
79
|
await (0, send_and_confirm_transaction_js_1.sendAndConfirmTransaction)({
|
|
76
80
|
account: options.account,
|
|
77
81
|
transaction: (0, prepare_contract_call_js_1.prepareContractCall)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zkDeployDeterministic.js","sourceRoot":"","sources":["../../../../../src/contract/deployment/zksync/zkDeployDeterministic.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"zkDeployDeterministic.js","sourceRoot":"","sources":["../../../../../src/contract/deployment/zksync/zkDeployDeterministic.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.computeDeploymentAddress = computeDeploymentAddress;
|
|
|
4
4
|
const viem_1 = require("viem");
|
|
5
5
|
const address_js_1 = require("../address.js");
|
|
6
6
|
const prefix_js_1 = require("../bytecode/prefix.js");
|
|
7
|
+
const hex_js_1 = require("../encoding/hex.js");
|
|
7
8
|
const keccak256_js_1 = require("../hashing/keccak256.js");
|
|
8
9
|
const get_salt_hash_js_1 = require("./get-salt-hash.js");
|
|
9
10
|
const keccak_id_js_1 = require("./keccak-id.js");
|
|
@@ -26,7 +27,9 @@ const keccak_id_js_1 = require("./keccak-id.js");
|
|
|
26
27
|
function computeDeploymentAddress(options) {
|
|
27
28
|
const bytecode = (0, prefix_js_1.ensureBytecodePrefix)(options.bytecode);
|
|
28
29
|
const saltHash = options.salt
|
|
29
|
-
? (0,
|
|
30
|
+
? (0, hex_js_1.isHex)(options.salt) && options.salt.length === 66
|
|
31
|
+
? options.salt
|
|
32
|
+
: (0, keccak_id_js_1.keccakId)(options.salt)
|
|
30
33
|
: (0, get_salt_hash_js_1.getSaltHash)(bytecode);
|
|
31
34
|
// 1. create init bytecode hash with contract's bytecode and encoded args
|
|
32
35
|
const initBytecode = (0, viem_1.encodePacked)(["bytes", "bytes"], [bytecode, options.encodedArgs]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compute-deployment-address.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/compute-deployment-address.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"compute-deployment-address.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/compute-deployment-address.ts"],"names":[],"mappings":";;AA+BA,4DAkCC;AAjED,+BAA8C;AAC9C,8CAA2C;AAC3C,qDAA6D;AAC7D,+CAA2C;AAC3C,0DAAoD;AACpD,yDAAiD;AACjD,iDAA0C;AAS1C;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,wBAAwB,CACtC,OAAwC;IAExC,MAAM,QAAQ,GAAG,IAAA,gCAAoB,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI;QAC3B,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,EAAE;YACjD,CAAC,CAAC,OAAO,CAAC,IAAI;YACd,CAAC,CAAC,IAAA,uBAAQ,EAAC,OAAO,CAAC,IAAI,CAAC;QAC1B,CAAC,CAAC,IAAA,8BAAW,EAAC,QAAQ,CAAC,CAAC;IAE1B,yEAAyE;IACzE,MAAM,YAAY,GAAG,IAAA,mBAAY,EAC/B,CAAC,OAAO,EAAE,OAAO,CAAC,EAClB,CAAC,QAAQ,EAAE,OAAO,CAAC,WAAW,CAAC,CAChC,CAAC;IAEF,mEAAmE;IACnE,MAAM,gBAAgB,GAAG,IAAA,mBAAY,EACnC,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,EAC3C;QACE,MAAM;QACN,IAAA,uBAAU,EAAC,OAAO,CAAC,qBAAqB,CAAC;QACzC,QAAQ;QACR,IAAA,wBAAS,EAAC,IAAA,mBAAY,EAAC,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;KACnD,CACF,CAAC;IAEF,iCAAiC;IACjC,MAAM,gBAAgB,GAAG,IAAA,wBAAS,EAChC,IAAA,mBAAY,EAAC,CAAC,OAAO,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAC5C,CAAC;IAEF,uFAAuF;IACvF,OAAO,KAAK,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;AAC3C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compute-published-contract-deploy-info.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/compute-published-contract-deploy-info.ts"],"names":[],"mappings":";;AAkBA,kFAuBC;AAKD,8EAmBC;AAED,
|
|
1
|
+
{"version":3,"file":"compute-published-contract-deploy-info.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/compute-published-contract-deploy-info.ts"],"names":[],"mappings":";;AAkBA,kFAuBC;AAKD,8EAmBC;AAED,8EAiCC;AAjGD,yEAAwF;AACxF,6FAAmG;AACnG,0EAAoE;AACpE,kFAA4E;AAC5E,qDAA6D;AAE7D,6DAG8B;AAC9B,qFAA2E;AAE3E;;GAEG;AACI,KAAK,UAAU,mCAAmC,CAAC,IAQzD;IACC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACpE,MAAM,gBAAgB,GAAG,MAAM,IAAA,6CAA8B,EAAC;QAC5D,MAAM;QACN,UAAU;QACV,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAC,CAAC;IACH,OAAO,iCAAiC,CAAC;QACvC,MAAM;QACN,KAAK;QACL,gBAAgB;QAChB,iBAAiB;QACjB,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,iCAAiC,CAAC,IAMvD;IACC,OAAO,iCAAiC,CAAC;QACvC,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,GAAG,EAAE,IAAI,CAAC,gBAAgB,CAAC,GAAG;QAC9B,QAAQ,EAAE,MAAM,IAAA,sDAAiC,EAAC;YAChD,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC;QACF,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;QACzC,IAAI,EAAE,IAAI,CAAC,IAAI;KAChB,CAAC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,iCAAiC,CAAC,IAOvD;IACC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACxD,MAAM,qBAAqB,GAAG,MAAM,IAAA,kDAA4B,EAAC;QAC/D,MAAM;QACN,KAAK;KACN,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,aAAa,CAE3D,CAAC;IACd,MAAM,WAAW,GAAG,IAAA,4CAAmB,EACrC,cAAc,EAAE,MAAM,IAAI,EAAE,EAC5B,IAAA,oDAAuB,EAAC,cAAc,EAAE,iBAAiB,CAAC,CAC3D,CAAC;IACF,MAAM,oBAAoB,GAAG,IAAA,wDAAuB,EAAC;QACnD,QAAQ;QACR,WAAW;QACX,IAAI;KACL,CAAC,CAAC;IACH,OAAO;QACL,QAAQ;QACR,oBAAoB;QACpB,WAAW;QACX,qBAAqB;QACrB,IAAI;KACL,CAAC;AACJ,CAAC"}
|
|
@@ -24,7 +24,9 @@ const keccak_id_js_1 = require("./keccak-id.js");
|
|
|
24
24
|
function getInitBytecodeWithSalt(options) {
|
|
25
25
|
const bytecode = (0, prefix_js_1.ensureBytecodePrefix)(options.bytecode);
|
|
26
26
|
const saltHash = options.salt
|
|
27
|
-
? (0,
|
|
27
|
+
? (0, hex_js_1.isHex)(options.salt) && options.salt.length === 66
|
|
28
|
+
? options.salt
|
|
29
|
+
: (0, keccak_id_js_1.keccakId)(options.salt)
|
|
28
30
|
: (0, get_salt_hash_js_1.getSaltHash)(bytecode);
|
|
29
31
|
const encodedArgs = typeof options.encodedArgs === "string"
|
|
30
32
|
? options.encodedArgs
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-init-bytecode-with-salt.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/get-init-bytecode-with-salt.ts"],"names":[],"mappings":";;AA2BA,
|
|
1
|
+
{"version":3,"file":"get-init-bytecode-with-salt.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/get-init-bytecode-with-salt.ts"],"names":[],"mappings":";;AA2BA,0DAoBC;AA/CD,sCAA0C;AAC1C,qDAA6D;AAC7D,+CAAsE;AACtE,yDAAiD;AACjD,iDAA0C;AAQ1C;;;;;;;;;;;;;;GAcG;AACH,SAAgB,uBAAuB,CACrC,OAAwC;IAExC,MAAM,QAAQ,GAAG,IAAA,gCAAoB,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAExD,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI;QAC3B,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,EAAE;YACjD,CAAC,CAAC,OAAO,CAAC,IAAI;YACd,CAAC,CAAC,IAAA,uBAAQ,EAAC,OAAO,CAAC,IAAI,CAAC;QAC1B,CAAC,CAAC,IAAA,8BAAW,EAAC,QAAQ,CAAC,CAAC;IAE1B,MAAM,WAAW,GACf,OAAO,OAAO,CAAC,WAAW,KAAK,QAAQ;QACrC,CAAC,CAAC,OAAO,CAAC,WAAW;QACrB,CAAC,CAAC,IAAA,wBAAe,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAE3C,OAAO,IAAA,oBAAY,EACjB,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,EAC7B,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAClC,CAAC;AACJ,CAAC"}
|
|
@@ -1,10 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.computeDeploymentAddress = computeDeploymentAddress;
|
|
4
|
+
const hex_js_1 = require("../../encoding/hex.js");
|
|
4
5
|
const keccak_id_js_1 = require("../keccak-id.js");
|
|
5
6
|
const create2Address_js_1 = require("./create2Address.js");
|
|
6
7
|
function computeDeploymentAddress(options) {
|
|
7
|
-
const saltHash = options.salt
|
|
8
|
+
const saltHash = options.salt
|
|
9
|
+
? (0, hex_js_1.isHex)(options.salt) && options.salt.length === 66
|
|
10
|
+
? options.salt
|
|
11
|
+
: (0, keccak_id_js_1.keccakId)(options.salt)
|
|
12
|
+
: (0, keccak_id_js_1.keccakId)("thirdweb");
|
|
8
13
|
return (0, create2Address_js_1.create2Address)({
|
|
9
14
|
sender: options.create2FactoryAddress,
|
|
10
15
|
bytecodeHash: options.bytecodeHash,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computeDeploymentAddress.js","sourceRoot":"","sources":["../../../../../src/utils/any-evm/zksync/computeDeploymentAddress.ts"],"names":[],"mappings":";;AAYA,
|
|
1
|
+
{"version":3,"file":"computeDeploymentAddress.js","sourceRoot":"","sources":["../../../../../src/utils/any-evm/zksync/computeDeploymentAddress.ts"],"names":[],"mappings":";;AAYA,4DAeC;AA1BD,kDAAwD;AACxD,kDAA2C;AAC3C,2DAAqD;AASrD,SAAgB,wBAAwB,CACtC,OAAwC;IAExC,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI;QAC3B,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,EAAE;YACjD,CAAC,CAAC,OAAO,CAAC,IAAI;YACd,CAAC,CAAC,IAAA,uBAAQ,EAAC,OAAO,CAAC,IAAI,CAAC;QAC1B,CAAC,CAAC,IAAA,uBAAQ,EAAC,UAAU,CAAC,CAAC;IAEzB,OAAO,IAAA,kCAAc,EAAC;QACpB,MAAM,EAAE,OAAO,CAAC,qBAAqB;QACrC,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,OAAO,CAAC,WAAW;KAC3B,CAAC,CAAC;AACL,CAAC"}
|
package/dist/cjs/version.js
CHANGED
package/dist/cjs/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG,wEAAwE,CAAC"}
|
|
@@ -10,7 +10,7 @@ import { computeDeploymentAddress } from "../../../utils/any-evm/zksync/computeD
|
|
|
10
10
|
import { KNOWN_CODES_STORAGE, singletonFactoryAbi, } from "../../../utils/any-evm/zksync/constants.js";
|
|
11
11
|
import { isContractDeployed } from "../../../utils/bytecode/is-contract-deployed.js";
|
|
12
12
|
import { ensureBytecodePrefix } from "../../../utils/bytecode/prefix.js";
|
|
13
|
-
import { uint8ArrayToHex } from "../../../utils/encoding/hex.js";
|
|
13
|
+
import { isHex, uint8ArrayToHex, } from "../../../utils/encoding/hex.js";
|
|
14
14
|
import { getContract } from "../../contract.js";
|
|
15
15
|
import { zkDeployContract } from "./zkDeployContract.js";
|
|
16
16
|
import { zkDeployCreate2Factory } from "./zkDeployCreate2Factory.js";
|
|
@@ -68,7 +68,11 @@ export async function zkDeployContractDeterministic(options) {
|
|
|
68
68
|
client: options.client,
|
|
69
69
|
abi: parseAbi(singletonFactoryAbi),
|
|
70
70
|
});
|
|
71
|
-
const salt = options?.salt
|
|
71
|
+
const salt = options?.salt
|
|
72
|
+
? isHex(options.salt) && options.salt.length === 66
|
|
73
|
+
? options.salt
|
|
74
|
+
: keccakId(options.salt)
|
|
75
|
+
: keccakId("thirdweb");
|
|
72
76
|
await sendAndConfirmTransaction({
|
|
73
77
|
account: options.account,
|
|
74
78
|
transaction: prepareContractCall({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zkDeployDeterministic.js","sourceRoot":"","sources":["../../../../../src/contract/deployment/zksync/zkDeployDeterministic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,QAAQ,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,8DAA8D,CAAC;AACzG,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,2DAA2D,CAAC;AACrG,OAAO,EACL,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAC;AACrF,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,
|
|
1
|
+
{"version":3,"file":"zkDeployDeterministic.js","sourceRoot":"","sources":["../../../../../src/contract/deployment/zksync/zkDeployDeterministic.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { encodePacked } from "viem";
|
|
2
2
|
import { getAddress } from "../address.js";
|
|
3
3
|
import { ensureBytecodePrefix } from "../bytecode/prefix.js";
|
|
4
|
+
import { isHex } from "../encoding/hex.js";
|
|
4
5
|
import { keccak256 } from "../hashing/keccak256.js";
|
|
5
6
|
import { getSaltHash } from "./get-salt-hash.js";
|
|
6
7
|
import { keccakId } from "./keccak-id.js";
|
|
@@ -23,7 +24,9 @@ import { keccakId } from "./keccak-id.js";
|
|
|
23
24
|
export function computeDeploymentAddress(options) {
|
|
24
25
|
const bytecode = ensureBytecodePrefix(options.bytecode);
|
|
25
26
|
const saltHash = options.salt
|
|
26
|
-
?
|
|
27
|
+
? isHex(options.salt) && options.salt.length === 66
|
|
28
|
+
? options.salt
|
|
29
|
+
: keccakId(options.salt)
|
|
27
30
|
: getSaltHash(bytecode);
|
|
28
31
|
// 1. create init bytecode hash with contract's bytecode and encoded args
|
|
29
32
|
const initBytecode = encodePacked(["bytes", "bytes"], [bytecode, options.encodedArgs]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compute-deployment-address.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/compute-deployment-address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,YAAY,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAS1C;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,wBAAwB,CACtC,OAAwC;IAExC,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI;QAC3B,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"compute-deployment-address.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/compute-deployment-address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,YAAY,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAS1C;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,wBAAwB,CACtC,OAAwC;IAExC,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI;QAC3B,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,EAAE;YACjD,CAAC,CAAC,OAAO,CAAC,IAAI;YACd,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;QAC1B,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAE1B,yEAAyE;IACzE,MAAM,YAAY,GAAG,YAAY,CAC/B,CAAC,OAAO,EAAE,OAAO,CAAC,EAClB,CAAC,QAAQ,EAAE,OAAO,CAAC,WAAW,CAAC,CAChC,CAAC;IAEF,mEAAmE;IACnE,MAAM,gBAAgB,GAAG,YAAY,CACnC,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,EAC3C;QACE,MAAM;QACN,UAAU,CAAC,OAAO,CAAC,qBAAqB,CAAC;QACzC,QAAQ;QACR,SAAS,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;KACnD,CACF,CAAC;IAEF,iCAAiC;IACjC,MAAM,gBAAgB,GAAG,SAAS,CAChC,YAAY,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAC5C,CAAC;IAEF,uFAAuF;IACvF,OAAO,KAAK,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;AAC3C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compute-published-contract-deploy-info.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/compute-published-contract-deploy-info.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,8BAA8B,EAAE,MAAM,wCAAwC,CAAC;AACxF,OAAO,EAAE,4BAA4B,EAAE,MAAM,qDAAqD,CAAC;AACnG,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,OAAO,EAEL,iCAAiC,GAClC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAE3E;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,mCAAmC,CAAC,IAQzD;IACC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACpE,MAAM,gBAAgB,GAAG,MAAM,8BAA8B,CAAC;QAC5D,MAAM;QACN,UAAU;QACV,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAC,CAAC;IACH,OAAO,iCAAiC,CAAC;QACvC,MAAM;QACN,KAAK;QACL,gBAAgB;QAChB,iBAAiB;QACjB,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iCAAiC,CAAC,IAMvD;IACC,OAAO,iCAAiC,CAAC;QACvC,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,GAAG,EAAE,IAAI,CAAC,gBAAgB,CAAC,GAAG;QAC9B,QAAQ,EAAE,MAAM,iCAAiC,CAAC;YAChD,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC;QACF,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;QACzC,IAAI,EAAE,IAAI,CAAC,IAAI;KAChB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iCAAiC,CAAC,IAOvD;IACC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACxD,MAAM,qBAAqB,GAAG,MAAM,4BAA4B,CAAC;QAC/D,MAAM;QACN,KAAK;KACN,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,aAAa,CAE3D,CAAC;IACd,MAAM,WAAW,GAAG,mBAAmB,CACrC,cAAc,EAAE,MAAM,IAAI,EAAE,EAC5B,uBAAuB,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAC3D,CAAC;IACF,MAAM,oBAAoB,GAAG,uBAAuB,CAAC;QACnD,QAAQ;QACR,WAAW;QACX,IAAI;KACL,CAAC,CAAC;IACH,OAAO;QACL,QAAQ;QACR,oBAAoB;QACpB,WAAW;QACX,qBAAqB;
|
|
1
|
+
{"version":3,"file":"compute-published-contract-deploy-info.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/compute-published-contract-deploy-info.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,8BAA8B,EAAE,MAAM,wCAAwC,CAAC;AACxF,OAAO,EAAE,4BAA4B,EAAE,MAAM,qDAAqD,CAAC;AACnG,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,OAAO,EAEL,iCAAiC,GAClC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAE3E;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,mCAAmC,CAAC,IAQzD;IACC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACpE,MAAM,gBAAgB,GAAG,MAAM,8BAA8B,CAAC;QAC5D,MAAM;QACN,UAAU;QACV,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAC,CAAC;IACH,OAAO,iCAAiC,CAAC;QACvC,MAAM;QACN,KAAK;QACL,gBAAgB;QAChB,iBAAiB;QACjB,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iCAAiC,CAAC,IAMvD;IACC,OAAO,iCAAiC,CAAC;QACvC,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,GAAG,EAAE,IAAI,CAAC,gBAAgB,CAAC,GAAG;QAC9B,QAAQ,EAAE,MAAM,iCAAiC,CAAC;YAChD,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC;QACF,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;QACzC,IAAI,EAAE,IAAI,CAAC,IAAI;KAChB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iCAAiC,CAAC,IAOvD;IACC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACxD,MAAM,qBAAqB,GAAG,MAAM,4BAA4B,CAAC;QAC/D,MAAM;QACN,KAAK;KACN,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,aAAa,CAE3D,CAAC;IACd,MAAM,WAAW,GAAG,mBAAmB,CACrC,cAAc,EAAE,MAAM,IAAI,EAAE,EAC5B,uBAAuB,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAC3D,CAAC;IACF,MAAM,oBAAoB,GAAG,uBAAuB,CAAC;QACnD,QAAQ;QACR,WAAW;QACX,IAAI;KACL,CAAC,CAAC;IACH,OAAO;QACL,QAAQ;QACR,oBAAoB;QACpB,WAAW;QACX,qBAAqB;QACrB,IAAI;KACL,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { encodePacked } from "viem/utils";
|
|
2
2
|
import { ensureBytecodePrefix } from "../bytecode/prefix.js";
|
|
3
|
-
import { uint8ArrayToHex } from "../encoding/hex.js";
|
|
3
|
+
import { isHex, uint8ArrayToHex } from "../encoding/hex.js";
|
|
4
4
|
import { getSaltHash } from "./get-salt-hash.js";
|
|
5
5
|
import { keccakId } from "./keccak-id.js";
|
|
6
6
|
/**
|
|
@@ -21,7 +21,9 @@ import { keccakId } from "./keccak-id.js";
|
|
|
21
21
|
export function getInitBytecodeWithSalt(options) {
|
|
22
22
|
const bytecode = ensureBytecodePrefix(options.bytecode);
|
|
23
23
|
const saltHash = options.salt
|
|
24
|
-
?
|
|
24
|
+
? isHex(options.salt) && options.salt.length === 66
|
|
25
|
+
? options.salt
|
|
26
|
+
: keccakId(options.salt)
|
|
25
27
|
: getSaltHash(bytecode);
|
|
26
28
|
const encodedArgs = typeof options.encodedArgs === "string"
|
|
27
29
|
? options.encodedArgs
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-init-bytecode-with-salt.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/get-init-bytecode-with-salt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAY,eAAe,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"get-init-bytecode-with-salt.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/get-init-bytecode-with-salt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAY,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAQ1C;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,uBAAuB,CACrC,OAAwC;IAExC,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAExD,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI;QAC3B,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,EAAE;YACjD,CAAC,CAAC,OAAO,CAAC,IAAI;YACd,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;QAC1B,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAE1B,MAAM,WAAW,GACf,OAAO,OAAO,CAAC,WAAW,KAAK,QAAQ;QACrC,CAAC,CAAC,OAAO,CAAC,WAAW;QACrB,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAE3C,OAAO,YAAY,CACjB,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,EAC7B,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAClC,CAAC;AACJ,CAAC"}
|
|
@@ -1,7 +1,12 @@
|
|
|
1
|
+
import { isHex } from "../../encoding/hex.js";
|
|
1
2
|
import { keccakId } from "../keccak-id.js";
|
|
2
3
|
import { create2Address } from "./create2Address.js";
|
|
3
4
|
export function computeDeploymentAddress(options) {
|
|
4
|
-
const saltHash = options.salt
|
|
5
|
+
const saltHash = options.salt
|
|
6
|
+
? isHex(options.salt) && options.salt.length === 66
|
|
7
|
+
? options.salt
|
|
8
|
+
: keccakId(options.salt)
|
|
9
|
+
: keccakId("thirdweb");
|
|
5
10
|
return create2Address({
|
|
6
11
|
sender: options.create2FactoryAddress,
|
|
7
12
|
bytecodeHash: options.bytecodeHash,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computeDeploymentAddress.js","sourceRoot":"","sources":["../../../../../src/utils/any-evm/zksync/computeDeploymentAddress.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"computeDeploymentAddress.js","sourceRoot":"","sources":["../../../../../src/utils/any-evm/zksync/computeDeploymentAddress.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AASrD,MAAM,UAAU,wBAAwB,CACtC,OAAwC;IAExC,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI;QAC3B,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,EAAE;YACjD,CAAC,CAAC,OAAO,CAAC,IAAI;YACd,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;QAC1B,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAEzB,OAAO,cAAc,CAAC;QACpB,MAAM,EAAE,OAAO,CAAC,qBAAqB;QACrC,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,OAAO,CAAC,WAAW;KAC3B,CAAC,CAAC;AACL,CAAC"}
|
package/dist/esm/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = "5.88.
|
|
1
|
+
export const version = "5.88.6-nightly-b182302f590e75c9881cebd0ca1cc8b1425d50b8-20250218000338";
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
package/dist/esm/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,wEAAwE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zkDeployDeterministic.d.ts","sourceRoot":"","sources":["../../../../../src/contract/deployment/zksync/zkDeployDeterministic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAiC,MAAM,SAAS,CAAC;AAelE,OAAO,
|
|
1
|
+
{"version":3,"file":"zkDeployDeterministic.d.ts","sourceRoot":"","sources":["../../../../../src/contract/deployment/zksync/zkDeployDeterministic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAiC,MAAM,SAAS,CAAC;AAelE,OAAO,EACL,KAAK,GAAG,EAGT,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AAKxE;;GAEG;AACH,wBAAsB,6BAA6B,CACjD,OAAO,EAAE,wBAAwB,GAAG;IAClC,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,EAAE,GAAG,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,mBA8EF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compute-deployment-address.d.ts","sourceRoot":"","sources":["../../../../src/utils/any-evm/compute-deployment-address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAgB,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"compute-deployment-address.d.ts","sourceRoot":"","sources":["../../../../src/utils/any-evm/compute-deployment-address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAgB,MAAM,MAAM,CAAC;AAQ9C,KAAK,+BAA+B,GAAG;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,GAAG,CAAC;IACjB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,+BAA+B,UAiCzC"}
|
|
@@ -19,6 +19,7 @@ export declare function computeDeploymentInfoFromContractId(args: {
|
|
|
19
19
|
initBytecodeWithsalt: `0x${string}`;
|
|
20
20
|
encodedArgs: `0x${string}`;
|
|
21
21
|
create2FactoryAddress: string;
|
|
22
|
+
salt: string | undefined;
|
|
22
23
|
}>;
|
|
23
24
|
/**
|
|
24
25
|
* @internal
|
|
@@ -34,6 +35,7 @@ export declare function computeDeploymentInfoFromMetadata(args: {
|
|
|
34
35
|
initBytecodeWithsalt: `0x${string}`;
|
|
35
36
|
encodedArgs: `0x${string}`;
|
|
36
37
|
create2FactoryAddress: string;
|
|
38
|
+
salt: string | undefined;
|
|
37
39
|
}>;
|
|
38
40
|
export declare function computeDeploymentInfoFromBytecode(args: {
|
|
39
41
|
client: ThirdwebClient;
|
|
@@ -47,5 +49,6 @@ export declare function computeDeploymentInfoFromBytecode(args: {
|
|
|
47
49
|
initBytecodeWithsalt: `0x${string}`;
|
|
48
50
|
encodedArgs: `0x${string}`;
|
|
49
51
|
create2FactoryAddress: string;
|
|
52
|
+
salt: string | undefined;
|
|
50
53
|
}>;
|
|
51
54
|
//# sourceMappingURL=compute-published-contract-deploy-info.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compute-published-contract-deploy-info.d.ts","sourceRoot":"","sources":["../../../../src/utils/any-evm/compute-published-contract-deploy-info.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAkB,MAAM,SAAS,CAAC;AACnD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAM7D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EACL,KAAK,yBAAyB,EAE/B,MAAM,sBAAsB,CAAC;AAG9B;;GAEG;AACH,wBAAsB,mCAAmC,CAAC,IAAI,EAAE;IAC9D,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf
|
|
1
|
+
{"version":3,"file":"compute-published-contract-deploy-info.d.ts","sourceRoot":"","sources":["../../../../src/utils/any-evm/compute-published-contract-deploy-info.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAkB,MAAM,SAAS,CAAC;AACnD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAM7D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EACL,KAAK,yBAAyB,EAE/B,MAAM,sBAAsB,CAAC;AAG9B;;GAEG;AACH,wBAAsB,mCAAmC,CAAC,IAAI,EAAE;IAC9D,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;;;;;;GAeA;AAED;;GAEG;AACH,wBAAsB,iCAAiC,CAAC,IAAI,EAAE;IAC5D,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,gBAAgB,EAAE,yBAAyB,CAAC;IAC5C,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;;;;;;GAaA;AAED,wBAAsB,iCAAiC,CAAC,IAAI,EAAE;IAC5D,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,EAAE,GAAG,CAAC;IACd,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;;;;;;GA0BA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-init-bytecode-with-salt.d.ts","sourceRoot":"","sources":["../../../../src/utils/any-evm/get-init-bytecode-with-salt.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"get-init-bytecode-with-salt.d.ts","sourceRoot":"","sources":["../../../../src/utils/any-evm/get-init-bytecode-with-salt.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,GAAG,EAA0B,MAAM,oBAAoB,CAAC;AAItE,KAAK,+BAA+B,GAAG;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,GAAG,GAAG,UAAU,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,+BAA+B,GACvC,GAAG,CAkBL"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computeDeploymentAddress.d.ts","sourceRoot":"","sources":["../../../../../src/utils/any-evm/zksync/computeDeploymentAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"computeDeploymentAddress.d.ts","sourceRoot":"","sources":["../../../../../src/utils/any-evm/zksync/computeDeploymentAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,KAAK,GAAG,EAAS,MAAM,uBAAuB,CAAC;AAIxD,KAAK,+BAA+B,GAAG;IACrC,YAAY,EAAE,GAAG,CAAC;IAClB,WAAW,EAAE,GAAG,CAAC;IACjB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,+BAA+B,UAczC"}
|
package/dist/types/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "5.88.
|
|
1
|
+
export declare const version = "5.88.6-nightly-b182302f590e75c9881cebd0ca1cc8b1425d50b8-20250218000338";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,2EAA2E,CAAC"}
|
package/package.json
CHANGED
|
@@ -7,6 +7,8 @@ import {
|
|
|
7
7
|
import { TEST_CLIENT } from "../../../test/src/test-clients.js";
|
|
8
8
|
import { TEST_ACCOUNT_A } from "../../../test/src/test-wallets.js";
|
|
9
9
|
import { simulateTransaction } from "../../transaction/actions/simulate.js";
|
|
10
|
+
import { computePublishedContractAddress } from "../../utils/any-evm/compute-published-contract-address.js";
|
|
11
|
+
import { keccakId } from "../../utils/any-evm/keccak-id.js";
|
|
10
12
|
import { ENTRYPOINT_ADDRESS_v0_6 } from "../../wallets/smart/lib/constants.js";
|
|
11
13
|
import { prepareDeterministicDeployTransaction } from "./deploy-deterministic.js";
|
|
12
14
|
|
|
@@ -51,6 +53,16 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
|
|
|
51
53
|
salt: "some-salt",
|
|
52
54
|
});
|
|
53
55
|
const tx2 = prepareDeterministicDeployTransaction({
|
|
56
|
+
chain: FORKED_ETHEREUM_CHAIN,
|
|
57
|
+
client: TEST_CLIENT,
|
|
58
|
+
contractId: "AccountFactory",
|
|
59
|
+
constructorParams: {
|
|
60
|
+
defaultAdmin: TEST_ACCOUNT_A.address,
|
|
61
|
+
entrypoint: ENTRYPOINT_ADDRESS_v0_6,
|
|
62
|
+
},
|
|
63
|
+
salt: keccakId("some-salt"),
|
|
64
|
+
});
|
|
65
|
+
const tx3 = prepareDeterministicDeployTransaction({
|
|
54
66
|
chain: FORKED_OPTIMISM_CHAIN,
|
|
55
67
|
client: TEST_CLIENT,
|
|
56
68
|
contractId: "AccountFactory",
|
|
@@ -59,11 +71,42 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
|
|
|
59
71
|
entrypoint: ENTRYPOINT_ADDRESS_v0_6,
|
|
60
72
|
},
|
|
61
73
|
});
|
|
62
|
-
const [tx1Result, tx2Result] = await Promise.all([
|
|
74
|
+
const [tx1Result, tx2Result, tx3Result] = await Promise.all([
|
|
63
75
|
simulateTransaction({ transaction: tx1 }),
|
|
64
76
|
simulateTransaction({ transaction: tx2 }),
|
|
77
|
+
simulateTransaction({ transaction: tx3 }),
|
|
78
|
+
]);
|
|
79
|
+
expect(tx1Result === tx2Result).toBe(true);
|
|
80
|
+
expect(tx1Result !== tx3Result).toBe(true);
|
|
81
|
+
});
|
|
82
|
+
|
|
83
|
+
it("computed address and deployed address should match", async () => {
|
|
84
|
+
const computedPromise = computePublishedContractAddress({
|
|
85
|
+
chain: FORKED_ETHEREUM_CHAIN,
|
|
86
|
+
client: TEST_CLIENT,
|
|
87
|
+
contractId: "AccountFactory",
|
|
88
|
+
constructorParams: {
|
|
89
|
+
defaultAdmin: TEST_ACCOUNT_A.address,
|
|
90
|
+
entrypoint: ENTRYPOINT_ADDRESS_v0_6,
|
|
91
|
+
},
|
|
92
|
+
salt: keccakId("some-salt"),
|
|
93
|
+
});
|
|
94
|
+
const tx = prepareDeterministicDeployTransaction({
|
|
95
|
+
chain: FORKED_ETHEREUM_CHAIN,
|
|
96
|
+
client: TEST_CLIENT,
|
|
97
|
+
contractId: "AccountFactory",
|
|
98
|
+
constructorParams: {
|
|
99
|
+
defaultAdmin: TEST_ACCOUNT_A.address,
|
|
100
|
+
entrypoint: ENTRYPOINT_ADDRESS_v0_6,
|
|
101
|
+
},
|
|
102
|
+
salt: keccakId("some-salt"),
|
|
103
|
+
});
|
|
104
|
+
|
|
105
|
+
const [computed, txResult] = await Promise.all([
|
|
106
|
+
computedPromise,
|
|
107
|
+
simulateTransaction({ transaction: tx }),
|
|
65
108
|
]);
|
|
66
|
-
expect(
|
|
109
|
+
expect(computed === txResult).toBe(true);
|
|
67
110
|
});
|
|
68
111
|
// TODO: Replace these tests' live contracts with mocks
|
|
69
112
|
it("should deploy a published contract with no constructor", async () => {
|
|
@@ -13,7 +13,11 @@ import {
|
|
|
13
13
|
} from "../../../utils/any-evm/zksync/constants.js";
|
|
14
14
|
import { isContractDeployed } from "../../../utils/bytecode/is-contract-deployed.js";
|
|
15
15
|
import { ensureBytecodePrefix } from "../../../utils/bytecode/prefix.js";
|
|
16
|
-
import {
|
|
16
|
+
import {
|
|
17
|
+
type Hex,
|
|
18
|
+
isHex,
|
|
19
|
+
uint8ArrayToHex,
|
|
20
|
+
} from "../../../utils/encoding/hex.js";
|
|
17
21
|
import type { ClientAndChainAndAccount } from "../../../utils/types.js";
|
|
18
22
|
import { getContract } from "../../contract.js";
|
|
19
23
|
import { zkDeployContract } from "./zkDeployContract.js";
|
|
@@ -89,7 +93,11 @@ export async function zkDeployContractDeterministic(
|
|
|
89
93
|
abi: parseAbi(singletonFactoryAbi),
|
|
90
94
|
});
|
|
91
95
|
|
|
92
|
-
const salt = options?.salt
|
|
96
|
+
const salt = options?.salt
|
|
97
|
+
? isHex(options.salt) && options.salt.length === 66
|
|
98
|
+
? options.salt
|
|
99
|
+
: keccakId(options.salt)
|
|
100
|
+
: keccakId("thirdweb");
|
|
93
101
|
|
|
94
102
|
await sendAndConfirmTransaction({
|
|
95
103
|
account: options.account,
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type Hex, encodePacked } from "viem";
|
|
2
2
|
import { getAddress } from "../address.js";
|
|
3
3
|
import { ensureBytecodePrefix } from "../bytecode/prefix.js";
|
|
4
|
+
import { isHex } from "../encoding/hex.js";
|
|
4
5
|
import { keccak256 } from "../hashing/keccak256.js";
|
|
5
6
|
import { getSaltHash } from "./get-salt-hash.js";
|
|
6
7
|
import { keccakId } from "./keccak-id.js";
|
|
@@ -33,7 +34,9 @@ export function computeDeploymentAddress(
|
|
|
33
34
|
) {
|
|
34
35
|
const bytecode = ensureBytecodePrefix(options.bytecode);
|
|
35
36
|
const saltHash = options.salt
|
|
36
|
-
?
|
|
37
|
+
? isHex(options.salt) && options.salt.length === 66
|
|
38
|
+
? options.salt
|
|
39
|
+
: keccakId(options.salt)
|
|
37
40
|
: getSaltHash(bytecode);
|
|
38
41
|
|
|
39
42
|
// 1. create init bytecode hash with contract's bytecode and encoded args
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { encodePacked } from "viem/utils";
|
|
2
2
|
import { ensureBytecodePrefix } from "../bytecode/prefix.js";
|
|
3
|
-
import { type Hex, uint8ArrayToHex } from "../encoding/hex.js";
|
|
3
|
+
import { type Hex, isHex, uint8ArrayToHex } from "../encoding/hex.js";
|
|
4
4
|
import { getSaltHash } from "./get-salt-hash.js";
|
|
5
5
|
import { keccakId } from "./keccak-id.js";
|
|
6
6
|
|
|
@@ -29,8 +29,11 @@ export function getInitBytecodeWithSalt(
|
|
|
29
29
|
options: GetInitiBytecodeWithSaltOptions,
|
|
30
30
|
): Hex {
|
|
31
31
|
const bytecode = ensureBytecodePrefix(options.bytecode);
|
|
32
|
+
|
|
32
33
|
const saltHash = options.salt
|
|
33
|
-
?
|
|
34
|
+
? isHex(options.salt) && options.salt.length === 66
|
|
35
|
+
? options.salt
|
|
36
|
+
: keccakId(options.salt)
|
|
34
37
|
: getSaltHash(bytecode);
|
|
35
38
|
|
|
36
39
|
const encodedArgs =
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Address } from "../../address.js";
|
|
2
|
-
import type
|
|
2
|
+
import { type Hex, isHex } from "../../encoding/hex.js";
|
|
3
3
|
import { keccakId } from "../keccak-id.js";
|
|
4
4
|
import { create2Address } from "./create2Address.js";
|
|
5
5
|
|
|
@@ -13,7 +13,11 @@ type ComputeDeploymentAddressOptions = {
|
|
|
13
13
|
export function computeDeploymentAddress(
|
|
14
14
|
options: ComputeDeploymentAddressOptions,
|
|
15
15
|
) {
|
|
16
|
-
const saltHash = options.salt
|
|
16
|
+
const saltHash = options.salt
|
|
17
|
+
? isHex(options.salt) && options.salt.length === 66
|
|
18
|
+
? options.salt
|
|
19
|
+
: keccakId(options.salt)
|
|
20
|
+
: keccakId("thirdweb");
|
|
17
21
|
|
|
18
22
|
return create2Address({
|
|
19
23
|
sender: options.create2FactoryAddress,
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = "5.88.
|
|
1
|
+
export const version = "5.88.6-nightly-b182302f590e75c9881cebd0ca1cc8b1425d50b8-20250218000338";
|