viem 0.0.0-main.20230922T020456 → 0.0.0-main.20230924T043910
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/_cjs/errors/version.js +1 -1
- package/_cjs/utils/address/getContractAddress.js +8 -3
- package/_cjs/utils/address/getContractAddress.js.map +1 -1
- package/_esm/errors/version.js +1 -1
- package/_esm/utils/address/getContractAddress.js +8 -3
- package/_esm/utils/address/getContractAddress.js.map +1 -1
- package/_types/errors/version.d.ts +1 -1
- package/_types/utils/address/getContractAddress.d.ts +4 -0
- package/_types/utils/address/getContractAddress.d.ts.map +1 -1
- package/errors/version.ts +1 -1
- package/package.json +1 -1
- package/utils/address/getContractAddress.ts +22 -14
- package/CHANGELOG.md +0 -7
package/_cjs/errors/version.js
CHANGED
|
@@ -28,9 +28,14 @@ function getCreate2Address(opts) {
|
|
|
28
28
|
const salt = (0, pad_js_1.pad)((0, isBytes_js_1.isBytes)(opts.salt) ? opts.salt : (0, toBytes_js_1.toBytes)(opts.salt), {
|
|
29
29
|
size: 32,
|
|
30
30
|
});
|
|
31
|
-
const bytecodeHash = (
|
|
32
|
-
|
|
33
|
-
|
|
31
|
+
const bytecodeHash = (() => {
|
|
32
|
+
if ('bytecodeHash' in opts) {
|
|
33
|
+
if ((0, isBytes_js_1.isBytes)(opts.bytecodeHash))
|
|
34
|
+
return opts.bytecodeHash;
|
|
35
|
+
return (0, toBytes_js_1.toBytes)(opts.bytecodeHash);
|
|
36
|
+
}
|
|
37
|
+
return (0, keccak256_js_1.keccak256)(opts.bytecode, 'bytes');
|
|
38
|
+
})();
|
|
34
39
|
return (0, getAddress_js_1.getAddress)((0, slice_js_1.slice)((0, keccak256_js_1.keccak256)((0, concat_js_1.concat)([(0, toBytes_js_1.toBytes)('0xff'), from, salt, bytecodeHash])), 12));
|
|
35
40
|
}
|
|
36
41
|
exports.getCreate2Address = getCreate2Address;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getContractAddress.js","sourceRoot":"","sources":["../../../utils/address/getContractAddress.ts"],"names":[],"mappings":";;;AAGA,iDAA0C;AAC1C,mDAA4C;AAC5C,2CAAoC;AACpC,+CAAwC;AACxC,uDAAgD;AAChD,mDAA4C;AAC5C,uDAAgD;AAEhD,mDAA4C;
|
|
1
|
+
{"version":3,"file":"getContractAddress.js","sourceRoot":"","sources":["../../../utils/address/getContractAddress.ts"],"names":[],"mappings":";;;AAGA,iDAA0C;AAC1C,mDAA4C;AAC5C,2CAAoC;AACpC,+CAAwC;AACxC,uDAAgD;AAChD,mDAA4C;AAC5C,uDAAgD;AAEhD,mDAA4C;AAyB5C,SAAgB,kBAAkB,CAAC,IAA+B;IAChE,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;QAAE,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAA;IAC7D,OAAO,gBAAgB,CAAC,IAAI,CAAC,CAAA;AAC/B,CAAC;AAHD,gDAGC;AAED,SAAgB,gBAAgB,CAAC,IAA6B;IAC5D,MAAM,IAAI,GAAG,IAAA,oBAAO,EAAC,IAAA,0BAAU,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAE3C,IAAI,KAAK,GAAG,IAAA,oBAAO,EAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAC/B,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;QAAE,KAAK,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAA;IAE9C,OAAO,IAAA,0BAAU,EACf,KAAK,IAAA,wBAAS,EAAC,IAAA,gBAAK,EAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,EAAa,CACrE,CAAA;AACH,CAAC;AATD,4CASC;AAED,SAAgB,iBAAiB,CAAC,IAA8B;IAC9D,MAAM,IAAI,GAAG,IAAA,oBAAO,EAAC,IAAA,0BAAU,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAC3C,MAAM,IAAI,GAAG,IAAA,YAAG,EAAC,IAAA,oBAAO,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,oBAAO,EAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QACpE,IAAI,EAAE,EAAE;KACT,CAAC,CAAA;IAEF,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE;QACzB,IAAI,cAAc,IAAI,IAAI,EAAE;YAC1B,IAAI,IAAA,oBAAO,EAAC,IAAI,CAAC,YAAY,CAAC;gBAAE,OAAO,IAAI,CAAC,YAAY,CAAA;YACxD,OAAO,IAAA,oBAAO,EAAC,IAAI,CAAC,YAAY,CAAC,CAAA;SAClC;QACD,OAAO,IAAA,wBAAS,EAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IAC1C,CAAC,CAAC,EAAE,CAAA;IAEJ,OAAO,IAAA,0BAAU,EACf,IAAA,gBAAK,EAAC,IAAA,wBAAS,EAAC,IAAA,kBAAM,EAAC,CAAC,IAAA,oBAAO,EAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAC1E,CAAA;AACH,CAAC;AAjBD,8CAiBC"}
|
package/_esm/errors/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = '0.0.0-main.
|
|
1
|
+
export const version = '0.0.0-main.20230924T043910';
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -23,9 +23,14 @@ export function getCreate2Address(opts) {
|
|
|
23
23
|
const salt = pad(isBytes(opts.salt) ? opts.salt : toBytes(opts.salt), {
|
|
24
24
|
size: 32,
|
|
25
25
|
});
|
|
26
|
-
const bytecodeHash =
|
|
27
|
-
|
|
28
|
-
|
|
26
|
+
const bytecodeHash = (() => {
|
|
27
|
+
if ('bytecodeHash' in opts) {
|
|
28
|
+
if (isBytes(opts.bytecodeHash))
|
|
29
|
+
return opts.bytecodeHash;
|
|
30
|
+
return toBytes(opts.bytecodeHash);
|
|
31
|
+
}
|
|
32
|
+
return keccak256(opts.bytecode, 'bytes');
|
|
33
|
+
})();
|
|
29
34
|
return getAddress(slice(keccak256(concat([toBytes('0xff'), from, salt, bytecodeHash])), 12));
|
|
30
35
|
}
|
|
31
36
|
//# sourceMappingURL=getContractAddress.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getContractAddress.js","sourceRoot":"","sources":["../../../utils/address/getContractAddress.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"getContractAddress.js","sourceRoot":"","sources":["../../../utils/address/getContractAddress.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAyB5C,MAAM,UAAU,kBAAkB,CAAC,IAA+B;IAChE,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;QAAE,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAA;IAC7D,OAAO,gBAAgB,CAAC,IAAI,CAAC,CAAA;AAC/B,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAA6B;IAC5D,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAE3C,IAAI,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAC/B,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;QAAE,KAAK,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAA;IAE9C,OAAO,UAAU,CACf,KAAK,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,EAAa,CACrE,CAAA;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,IAA8B;IAC9D,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAC3C,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QACpE,IAAI,EAAE,EAAE;KACT,CAAC,CAAA;IAEF,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE;QACzB,IAAI,cAAc,IAAI,IAAI,EAAE;YAC1B,IAAI,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC;gBAAE,OAAO,IAAI,CAAC,YAAY,CAAA;YACxD,OAAO,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;SAClC;QACD,OAAO,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IAC1C,CAAC,CAAC,EAAE,CAAA;IAEJ,OAAO,UAAU,CACf,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAC1E,CAAA;AACH,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "0.0.0-main.
|
|
1
|
+
export declare const version = "0.0.0-main.20230924T043910";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -8,6 +8,10 @@ export type GetCreate2AddressOptions = {
|
|
|
8
8
|
bytecode: ByteArray | Hex;
|
|
9
9
|
from: Address;
|
|
10
10
|
salt: ByteArray | Hex;
|
|
11
|
+
} | {
|
|
12
|
+
bytecodeHash: ByteArray | Hex;
|
|
13
|
+
from: Address;
|
|
14
|
+
salt: ByteArray | Hex;
|
|
11
15
|
};
|
|
12
16
|
export type GetContractAddressOptions = ({
|
|
13
17
|
opcode?: 'CREATE';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getContractAddress.d.ts","sourceRoot":"","sources":["../../../utils/address/getContractAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEtC,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAWzD,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,wBAAwB,
|
|
1
|
+
{"version":3,"file":"getContractAddress.d.ts","sourceRoot":"","sources":["../../../utils/address/getContractAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEtC,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAWzD,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,wBAAwB,GAChC;IACE,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAA;IACzB,IAAI,EAAE,OAAO,CAAA;IACb,IAAI,EAAE,SAAS,GAAG,GAAG,CAAA;CACtB,GACD;IACE,YAAY,EAAE,SAAS,GAAG,GAAG,CAAA;IAC7B,IAAI,EAAE,OAAO,CAAA;IACb,IAAI,EAAE,SAAS,GAAG,GAAG,CAAA;CACtB,CAAA;AAEL,MAAM,MAAM,yBAAyB,GACjC,CAAC;IACC,MAAM,CAAC,EAAE,QAAQ,CAAA;CAClB,GAAG,uBAAuB,CAAC,GAC5B,CAAC;IAAE,MAAM,EAAE,SAAS,CAAA;CAAE,GAAG,wBAAwB,CAAC,CAAA;AAEtD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,yBAAyB,iBAGjE;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,uBAAuB,iBAS7D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,wBAAwB,iBAiB/D"}
|
package/errors/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = '0.0.0-main.
|
|
1
|
+
export const version = '0.0.0-main.20230924T043910'
|
package/package.json
CHANGED
|
@@ -16,11 +16,17 @@ export type GetCreateAddressOptions = {
|
|
|
16
16
|
nonce: bigint
|
|
17
17
|
}
|
|
18
18
|
|
|
19
|
-
export type GetCreate2AddressOptions =
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
19
|
+
export type GetCreate2AddressOptions =
|
|
20
|
+
| {
|
|
21
|
+
bytecode: ByteArray | Hex
|
|
22
|
+
from: Address
|
|
23
|
+
salt: ByteArray | Hex
|
|
24
|
+
}
|
|
25
|
+
| {
|
|
26
|
+
bytecodeHash: ByteArray | Hex
|
|
27
|
+
from: Address
|
|
28
|
+
salt: ByteArray | Hex
|
|
29
|
+
}
|
|
24
30
|
|
|
25
31
|
export type GetContractAddressOptions =
|
|
26
32
|
| ({
|
|
@@ -46,16 +52,18 @@ export function getCreateAddress(opts: GetCreateAddressOptions) {
|
|
|
46
52
|
|
|
47
53
|
export function getCreate2Address(opts: GetCreate2AddressOptions) {
|
|
48
54
|
const from = toBytes(getAddress(opts.from))
|
|
49
|
-
const salt = pad(isBytes(opts.salt) ? opts.salt : toBytes(opts.salt
|
|
55
|
+
const salt = pad(isBytes(opts.salt) ? opts.salt : toBytes(opts.salt), {
|
|
50
56
|
size: 32,
|
|
51
|
-
})
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
57
|
+
})
|
|
58
|
+
|
|
59
|
+
const bytecodeHash = (() => {
|
|
60
|
+
if ('bytecodeHash' in opts) {
|
|
61
|
+
if (isBytes(opts.bytecodeHash)) return opts.bytecodeHash
|
|
62
|
+
return toBytes(opts.bytecodeHash)
|
|
63
|
+
}
|
|
64
|
+
return keccak256(opts.bytecode, 'bytes')
|
|
65
|
+
})()
|
|
66
|
+
|
|
59
67
|
return getAddress(
|
|
60
68
|
slice(keccak256(concat([toBytes('0xff'), from, salt, bytecodeHash])), 12),
|
|
61
69
|
)
|
package/CHANGELOG.md
DELETED
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
# viem
|
|
2
|
-
|
|
3
|
-
## 1.12.1
|
|
4
|
-
|
|
5
|
-
### Patch Changes
|
|
6
|
-
|
|
7
|
-
- [#1242](https://github.com/wagmi-dev/viem/pull/1242) [`44367dbe`](https://github.com/wagmi-dev/viem/commit/44367dbe921cfd12a45d78744758474b67d28791) Thanks [@gymnasy55](https://github.com/gymnasy55)! - Fixed Sepolia multicall3 block created.
|