@zoralabs/protocol-sdk 0.11.7-COMMENTS.0 → 0.11.7
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/.turbo/turbo-build.log +7 -7
- package/CHANGELOG.md +2 -8
- package/dist/create/mint-from-create.d.ts +1 -2
- package/dist/create/mint-from-create.d.ts.map +1 -1
- package/dist/index.cjs +42 -196
- package/dist/index.cjs.map +1 -1
- package/dist/index.js +44 -202
- package/dist/index.js.map +1 -1
- package/dist/mint/mint-client.d.ts +1 -3
- package/dist/mint/mint-client.d.ts.map +1 -1
- package/dist/mint/mint-queries.d.ts +3 -5
- package/dist/mint/mint-queries.d.ts.map +1 -1
- package/dist/mint/mint-transactions.d.ts +2 -4
- package/dist/mint/mint-transactions.d.ts.map +1 -1
- package/dist/sdk.d.ts.map +1 -1
- package/dist/secondary/secondary-client.d.ts +1 -2
- package/dist/secondary/secondary-client.d.ts.map +1 -1
- package/dist/secondary/types.d.ts +0 -1
- package/dist/secondary/types.d.ts.map +1 -1
- package/dist/test-utils.d.ts +1 -5
- package/dist/test-utils.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/create/1155-create-helper.test.ts +12 -2
- package/src/create/1155-create-helper.ts +0 -2
- package/src/create/mint-from-create.ts +0 -3
- package/src/mint/mint-client.test.ts +30 -67
- package/src/mint/mint-client.ts +1 -10
- package/src/mint/mint-queries.ts +5 -16
- package/src/mint/mint-transactions.ts +16 -80
- package/src/rewards/subgraph-queries.ts +1 -1
- package/src/sdk.ts +0 -1
- package/src/secondary/secondary-client.test.ts +2 -248
- package/src/secondary/secondary-client.ts +6 -136
- package/src/secondary/types.ts +0 -2
- package/src/sparks/sparks-sponsored-sparks-spender.test.ts +1 -2
- package/src/test-utils.ts +0 -19
- package/src/comments/comments.test.ts +0 -338
|
@@ -15,12 +15,10 @@ export declare class MintClient {
|
|
|
15
15
|
private readonly publicClient;
|
|
16
16
|
private readonly mintGetter;
|
|
17
17
|
private readonly premintGetter;
|
|
18
|
-
|
|
19
|
-
constructor({ publicClient, premintGetter, mintGetter, chainId, }: {
|
|
18
|
+
constructor({ publicClient, premintGetter, mintGetter, }: {
|
|
20
19
|
publicClient: IPublicClient;
|
|
21
20
|
premintGetter: IPremintGetter;
|
|
22
21
|
mintGetter: IOnchainMintGetter;
|
|
23
|
-
chainId: number;
|
|
24
22
|
});
|
|
25
23
|
/**
|
|
26
24
|
* Returns the parameters needed to prepare a transaction mint a token.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mint-client.d.ts","sourceRoot":"","sources":["../../src/mint/mint-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,SAAS,EACT,iBAAiB,EACjB,QAAQ,EACT,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,2BAA2B,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAIhE,cAAM,SAAU,SAAQ,KAAK;CAAG;AAChC,cAAM,iBAAkB,SAAQ,KAAK;CAAG;AAExC,eAAO,MAAM,MAAM;;;CAGlB,CAAC;AAEF,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAC7C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqB;IAChD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;
|
|
1
|
+
{"version":3,"file":"mint-client.d.ts","sourceRoot":"","sources":["../../src/mint/mint-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,SAAS,EACT,iBAAiB,EACjB,QAAQ,EACT,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,2BAA2B,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAIhE,cAAM,SAAU,SAAQ,KAAK;CAAG;AAChC,cAAM,iBAAkB,SAAQ,KAAK;CAAG;AAExC,eAAO,MAAM,MAAM;;;CAGlB,CAAC;AAEF,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAC7C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqB;IAChD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;gBAEnC,EACV,YAAY,EACZ,aAAa,EACb,UAAU,GACX,EAAE;QACD,YAAY,EAAE,aAAa,CAAC;QAC5B,aAAa,EAAE,cAAc,CAAC;QAC9B,UAAU,EAAE,kBAAkB,CAAC;KAChC;IAMD;;;;;;OAMG;IACG,IAAI,CACR,UAAU,EAAE,2BAA2B,GACtC,OAAO,CAAC,iBAAiB,CAAC;IAS7B;;;;;OAKG;IACG,GAAG,CAAC,UAAU,EAAE,iBAAiB;IASvC;;;;;OAKG;IACG,aAAa,CAAC,MAAM,EAAE;QAC1B,aAAa,EAAE,OAAO,CAAC;QACvB,iBAAiB,CAAC,EAAE,QAAQ,CAAC;KAC9B;;;;IASD;;;;OAIG;IACG,YAAY,CAAC,UAAU,EAAE,sBAAsB,GAAG,OAAO,CAAC,SAAS,CAAC;CAQ3E"}
|
|
@@ -4,12 +4,11 @@ import { Address } from "viem";
|
|
|
4
4
|
import { PremintFromApi } from "src/premint/conversions";
|
|
5
5
|
import { IPublicClient } from "src/types";
|
|
6
6
|
import { AllowListEntry } from "src/allow-list/types";
|
|
7
|
-
export declare function getMint({ params, mintGetter, premintGetter, publicClient,
|
|
7
|
+
export declare function getMint({ params, mintGetter, premintGetter, publicClient, }: {
|
|
8
8
|
params: GetMintParameters;
|
|
9
9
|
mintGetter: IOnchainMintGetter;
|
|
10
10
|
premintGetter: IPremintGetter;
|
|
11
11
|
publicClient: IPublicClient;
|
|
12
|
-
chainId: number;
|
|
13
12
|
}): Promise<MintableReturn>;
|
|
14
13
|
export declare function getPremintsOfCollectionWithTokenIds({ premintGetter, mintGetter, tokenContract, }: {
|
|
15
14
|
premintGetter: IPremintGetter;
|
|
@@ -23,12 +22,11 @@ export declare function getPremintsOfCollectionWithTokenIds({ premintGetter, min
|
|
|
23
22
|
signature: import("viem").Hex;
|
|
24
23
|
}[];
|
|
25
24
|
}>;
|
|
26
|
-
export declare function getMintsOfContract({ params, mintGetter, premintGetter, publicClient,
|
|
25
|
+
export declare function getMintsOfContract({ params, mintGetter, premintGetter, publicClient, }: {
|
|
27
26
|
params: GetMintsOfContractParameters;
|
|
28
27
|
mintGetter: IOnchainMintGetter;
|
|
29
28
|
premintGetter: IPremintGetter;
|
|
30
29
|
publicClient: IPublicClient;
|
|
31
|
-
chainId: number;
|
|
32
30
|
}): Promise<{
|
|
33
31
|
contract?: ContractInfo;
|
|
34
32
|
tokens: MintableReturn[];
|
|
@@ -41,6 +39,6 @@ export declare function getMintCosts({ params, allowListEntry, mintGetter, premi
|
|
|
41
39
|
publicClient: IPublicClient;
|
|
42
40
|
}): Promise<import("./types").MintCosts>;
|
|
43
41
|
export declare function isPrimaryMintActive(premint: Pick<PremintFromApi, "premint">["premint"]): boolean;
|
|
44
|
-
export declare const makeOnchainPrepareMint: (result: OnchainSalesConfigAndTokenInfo
|
|
42
|
+
export declare const makeOnchainPrepareMint: (result: OnchainSalesConfigAndTokenInfo) => PrepareMint;
|
|
45
43
|
export declare function getRequiredErc20Approvals(params: MintParametersBase, salesConfig: OnchainSalesConfigAndTokenInfo["salesConfig"]): Erc20Approval | undefined;
|
|
46
44
|
//# sourceMappingURL=mint-queries.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mint-queries.d.ts","sourceRoot":"","sources":["../../src/mint/mint-queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EACL,YAAY,EACZ,aAAa,EACb,sBAAsB,EACtB,iBAAiB,EACjB,4BAA4B,EAC5B,kBAAkB,EAClB,kBAAkB,EAClB,cAAc,EACd,8BAA8B,EAE9B,WAAW,EAIZ,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,OAAO,EAAe,MAAM,MAAM,CAAC;AAK5C,OAAO,EACL,cAAc,EAGf,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,wBAAsB,OAAO,CAAC,EAC5B,MAAM,EACN,UAAU,EACV,aAAa,EACb,YAAY,
|
|
1
|
+
{"version":3,"file":"mint-queries.d.ts","sourceRoot":"","sources":["../../src/mint/mint-queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EACL,YAAY,EACZ,aAAa,EACb,sBAAsB,EACtB,iBAAiB,EACjB,4BAA4B,EAC5B,kBAAkB,EAClB,kBAAkB,EAClB,cAAc,EACd,8BAA8B,EAE9B,WAAW,EAIZ,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,OAAO,EAAe,MAAM,MAAM,CAAC;AAK5C,OAAO,EACL,cAAc,EAGf,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,wBAAsB,OAAO,CAAC,EAC5B,MAAM,EACN,UAAU,EACV,aAAa,EACb,YAAY,GACb,EAAE;IACD,MAAM,EAAE,iBAAiB,CAAC;IAC1B,UAAU,EAAE,kBAAkB,CAAC;IAC/B,aAAa,EAAE,cAAc,CAAC;IAC9B,YAAY,EAAE,aAAa,CAAC;CAC7B,GAAG,OAAO,CAAC,cAAc,CAAC,CA0B1B;AACD,wBAAsB,mCAAmC,CAAC,EACxD,aAAa,EACb,UAAU,EACV,aAAa,GACd,EAAE;IACD,aAAa,EAAE,cAAc,CAAC;IAC9B,UAAU,EAAE,kBAAkB,CAAC;IAC/B,aAAa,EAAE,OAAO,CAAC;CACxB;;;;;;;GAoBA;AAED,wBAAsB,kBAAkB,CAAC,EACvC,MAAM,EACN,UAAU,EACV,aAAa,EACb,YAAY,GACb,EAAE;IACD,MAAM,EAAE,4BAA4B,CAAC;IACrC,UAAU,EAAE,kBAAkB,CAAC;IAC/B,aAAa,EAAE,cAAc,CAAC;IAC9B,YAAY,EAAE,aAAa,CAAC;CAC7B,GAAG,OAAO,CAAC;IAAE,QAAQ,CAAC,EAAE,YAAY,CAAC;IAAC,MAAM,EAAE,cAAc,EAAE,CAAA;CAAE,CAAC,CAsBjE;AAED,wBAAsB,YAAY,CAAC,EACjC,MAAM,EACN,cAAc,EACd,UAAU,EACV,aAAa,EACb,YAAY,GACb,EAAE;IACD,MAAM,EAAE,sBAAsB,CAAC;IAC/B,cAAc,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAC/C,UAAU,EAAE,kBAAkB,CAAC;IAC/B,aAAa,EAAE,cAAc,CAAC;IAC9B,YAAY,EAAE,aAAa,CAAC;CAC7B,wCA6BA;AA+CD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC,SAAS,CAAC,WAKpD;AA2CD,eAAO,MAAM,sBAAsB,WACxB,8BAA8B,KAAG,WAkBzC,CAAC;AA4EJ,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,kBAAkB,EAC1B,WAAW,EAAE,8BAA8B,CAAC,aAAa,CAAC,GACzD,aAAa,GAAG,SAAS,CAQ3B"}
|
|
@@ -5,16 +5,14 @@ import { MintCosts, SaleStrategies } from "./types";
|
|
|
5
5
|
import { MakeMintParametersArgumentsBase } from "./types";
|
|
6
6
|
import { OnchainSalesConfigAndTokenInfo } from "./types";
|
|
7
7
|
import { AllowListEntry } from "src/allow-list/types";
|
|
8
|
-
export declare function makeOnchainMintCall({ token, mintParams,
|
|
8
|
+
export declare function makeOnchainMintCall({ token, mintParams, }: {
|
|
9
9
|
token: Concrete<OnchainSalesConfigAndTokenInfo>;
|
|
10
10
|
mintParams: Omit<MakeMintParametersArgumentsBase, "tokenContract">;
|
|
11
|
-
chainId: number;
|
|
12
11
|
}): SimulateContractParametersWithAccount;
|
|
13
12
|
export type MintableParameters = Pick<OnchainSalesConfigAndTokenInfo, "contractVersion" | "salesConfig">;
|
|
14
|
-
export declare function makePrepareMint1155TokenParams({ tokenContract: tokenContract, tokenId, salesConfigAndTokenInfo, minterAccount, mintComment, mintReferral, mintRecipient, quantityToMint, allowListEntry,
|
|
13
|
+
export declare function makePrepareMint1155TokenParams({ tokenContract: tokenContract, tokenId, salesConfigAndTokenInfo, minterAccount, mintComment, mintReferral, mintRecipient, quantityToMint, allowListEntry, }: {
|
|
15
14
|
salesConfigAndTokenInfo: Concrete<MintableParameters>;
|
|
16
15
|
tokenId: GenericTokenIdTypes;
|
|
17
|
-
chainId: number;
|
|
18
16
|
} & Pick<MakeMintParametersArgumentsBase, "minterAccount" | "tokenContract" | "mintComment" | "mintReferral" | "quantityToMint" | "mintRecipient" | "allowListEntry">): SimulateContractParameters<any, any, any, any, any, Address | Account>;
|
|
19
17
|
export declare function parseMintCosts({ salesConfig, quantityToMint, allowListEntry, }: {
|
|
20
18
|
salesConfig: SaleStrategies;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mint-transactions.d.ts","sourceRoot":"","sources":["../../src/mint/mint-transactions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAIP,OAAO,EACP,0BAA0B,EAE3B,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"mint-transactions.d.ts","sourceRoot":"","sources":["../../src/mint/mint-transactions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAIP,OAAO,EACP,0BAA0B,EAE3B,MAAM,MAAM,CAAC;AAOd,OAAO,EACL,mBAAmB,EACnB,qCAAqC,EACtC,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,QAAQ,EAGT,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,SAAS,EAAE,cAAc,EAAuB,MAAM,SAAS,CAAC;AACzE,OAAO,EAAE,+BAA+B,EAAE,MAAM,SAAS,CAAC;AAG1D,OAAO,EAAE,8BAA8B,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,wBAAgB,mBAAmB,CAAC,EAClC,KAAK,EACL,UAAU,GACX,EAAE;IACD,KAAK,EAAE,QAAQ,CAAC,8BAA8B,CAAC,CAAC;IAChD,UAAU,EAAE,IAAI,CAAC,+BAA+B,EAAE,eAAe,CAAC,CAAC;CACpE,GAAG,qCAAqC,CAexC;AAED,MAAM,MAAM,kBAAkB,GAAG,IAAI,CACnC,8BAA8B,EAC9B,iBAAiB,GAAG,aAAa,CAClC,CAAC;AAEF,wBAAgB,8BAA8B,CAAC,EAC7C,aAAa,EAAE,aAAa,EAC5B,OAAO,EACP,uBAAuB,EACvB,aAAa,EACb,WAAW,EACX,YAAY,EACZ,aAAa,EACb,cAAc,EACd,cAAc,GACf,EAAE;IACD,uBAAuB,EAAE,QAAQ,CAAC,kBAAkB,CAAC,CAAC;IACtD,OAAO,EAAE,mBAAmB,CAAC;CAC9B,GAAG,IAAI,CACN,+BAA+B,EAC7B,eAAe,GACf,eAAe,GACf,aAAa,GACb,cAAc,GACd,gBAAgB,GAChB,eAAe,GACf,gBAAgB,CACnB,GAAG,0BAA0B,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,CA8DzE;AAwKD,wBAAgB,cAAc,CAAC,EAC7B,WAAW,EACX,cAAc,EACd,cAAc,GACf,EAAE;IACD,WAAW,EAAE,cAAc,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;CAC3D,GAAG,SAAS,CAoBZ"}
|
package/dist/sdk.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdk.d.ts","sourceRoot":"","sources":["../src/sdk.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEd,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,WAAW,EAAoB,MAAM,8BAA8B,CAAC;AAE7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EACL,eAAe,EAEhB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EACL,cAAc,EAEf,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,MAAM,MAAM,aAAa,GAAG;IAC1B,aAAa,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IAC9C,aAAa,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IAC9C,aAAa,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IAC9C,UAAU,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC;IAC9C,4BAA4B,EAAE,gBAAgB,CAAC,iCAAiC,CAAC,CAAC;IAClF,eAAe,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAClD,kBAAkB,EAAE,aAAa,CAAC,oBAAoB,CAAC,CAAC;CACzD,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IACxC,gCAAgC,EAAE,aAAa,CAAC,2BAA2B,CAAC,CAAC;IAC7E,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IACzB,YAAY,EAAE,UAAU,CAAC,cAAc,CAAC,CAAC;IACzC,QAAQ,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;IAC5B,mBAAmB,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC;IACjD,kBAAkB,EAAE,eAAe,CAAC,oBAAoB,CAAC,CAAC;IAC1D,mBAAmB,EAAE,eAAe,CAAC,qBAAqB,CAAC,CAAC;IAC5D,gBAAgB,EAAE,eAAe,CAAC,kBAAkB,CAAC,CAAC;CACvD,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,YAAY,GAAG;IAC/C,iFAAiF;IACjF,UAAU,CAAC,EAAE,WAAW,CAAC;IACzB,cAAc,CAAC,EAAE,eAAe,CAAC;IACjC,aAAa,CAAC,EAAE,cAAc,CAAC;CAChC,CAAC;AAEF;;;;;KAKK;AACL,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,mBAAmB,GAChC,aAAa,CAkCf;AAED,MAAM,MAAM,qBAAqB,GAAG,YAAY,GAAG;IACjD,kEAAkE;IAClE,aAAa,CAAC,EAAE,WAAW,CAAC;IAC5B,4EAA4E;IAC5E,UAAU,CAAC,EAAE,kBAAkB,CAAC;CACjC,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,qBAAqB,GAC5B,eAAe,
|
|
1
|
+
{"version":3,"file":"sdk.d.ts","sourceRoot":"","sources":["../src/sdk.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEd,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,WAAW,EAAoB,MAAM,8BAA8B,CAAC;AAE7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EACL,eAAe,EAEhB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EACL,cAAc,EAEf,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,MAAM,MAAM,aAAa,GAAG;IAC1B,aAAa,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IAC9C,aAAa,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IAC9C,aAAa,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IAC9C,UAAU,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC;IAC9C,4BAA4B,EAAE,gBAAgB,CAAC,iCAAiC,CAAC,CAAC;IAClF,eAAe,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAClD,kBAAkB,EAAE,aAAa,CAAC,oBAAoB,CAAC,CAAC;CACzD,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IACxC,gCAAgC,EAAE,aAAa,CAAC,2BAA2B,CAAC,CAAC;IAC7E,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IACzB,YAAY,EAAE,UAAU,CAAC,cAAc,CAAC,CAAC;IACzC,QAAQ,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;IAC5B,mBAAmB,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC;IACjD,kBAAkB,EAAE,eAAe,CAAC,oBAAoB,CAAC,CAAC;IAC1D,mBAAmB,EAAE,eAAe,CAAC,qBAAqB,CAAC,CAAC;IAC5D,gBAAgB,EAAE,eAAe,CAAC,kBAAkB,CAAC,CAAC;CACvD,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,YAAY,GAAG;IAC/C,iFAAiF;IACjF,UAAU,CAAC,EAAE,WAAW,CAAC;IACzB,cAAc,CAAC,EAAE,eAAe,CAAC;IACjC,aAAa,CAAC,EAAE,cAAc,CAAC;CAChC,CAAC;AAEF;;;;;KAKK;AACL,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,mBAAmB,GAChC,aAAa,CAkCf;AAED,MAAM,MAAM,qBAAqB,GAAG,YAAY,GAAG;IACjD,kEAAkE;IAClE,aAAa,CAAC,EAAE,WAAW,CAAC;IAC5B,4EAA4E;IAC5E,UAAU,CAAC,EAAE,kBAAkB,CAAC;CACjC,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,qBAAqB,GAC5B,eAAe,CA+BjB"}
|
|
@@ -3,7 +3,6 @@ import { PublicClient } from "src/utils";
|
|
|
3
3
|
import { SimulateContractParametersWithAccount } from "src/types";
|
|
4
4
|
import { QuotePrice, BuyWithSlippageInput, SellWithSlippageInput, SecondaryInfo } from "./types";
|
|
5
5
|
export declare const ERROR_SECONDARY_NOT_STARTED = "Secondary market has not started";
|
|
6
|
-
export declare const ERROR_RECIPIENT_MISMATCH = "Recipient must be the same as the caller if there is a comment";
|
|
7
6
|
type Call = {
|
|
8
7
|
parameters: SimulateContractParametersWithAccount;
|
|
9
8
|
error?: undefined;
|
|
@@ -18,7 +17,7 @@ type BuyOrSellWithSlippageResult = ({
|
|
|
18
17
|
price?: undefined;
|
|
19
18
|
parameters?: undefined;
|
|
20
19
|
};
|
|
21
|
-
export declare function buyWithSlippage({ contract, tokenId, publicClient, quantity, chainId, account, slippage, recipient,
|
|
20
|
+
export declare function buyWithSlippage({ contract, tokenId, publicClient, quantity, chainId, account, slippage, recipient, }: BuyWithSlippageInput & {
|
|
22
21
|
chainId: number;
|
|
23
22
|
publicClient: PublicClient;
|
|
24
23
|
}): Promise<BuyOrSellWithSlippageResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secondary-client.d.ts","sourceRoot":"","sources":["../../src/secondary/secondary-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,OAAO,EAAuB,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"secondary-client.d.ts","sourceRoot":"","sources":["../../src/secondary/secondary-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,OAAO,EAAuB,MAAM,MAAM,CAAC;AAO7D,OAAO,EAA0B,YAAY,EAAE,MAAM,WAAW,CAAC;AAKjE,OAAO,EAAE,qCAAqC,EAAE,MAAM,WAAW,CAAC;AAClE,OAAO,EACL,UAAU,EACV,oBAAoB,EACpB,qBAAqB,EACrB,aAAa,EACd,MAAM,SAAS,CAAC;AAUjB,eAAO,MAAM,2BAA2B,qCAAqC,CAAC;AAO9E,KAAK,IAAI,GACL;IAEE,UAAU,EAAE,qCAAqC,CAAC;IAClD,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB,GACD;IACE,UAAU,CAAC,EAAE,SAAS,CAAC;IAEvB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA8DN,KAAK,2BAA2B,GAC5B,CAAC;IAEC,KAAK,EAAE,UAAU,CAAC;CACnB,GAAG,IAAI,CAAC,GACT;IACE,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,UAAU,CAAC,EAAE,SAAS,CAAC;CACxB,CAAC;AAEN,wBAAsB,eAAe,CAAC,EACpC,QAAQ,EACR,OAAO,EACP,YAAY,EACZ,QAAQ,EACR,OAAO,EACP,OAAO,EACP,QAA2B,EAC3B,SAAS,GACV,EAAE,oBAAoB,GAAG;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,YAAY,CAAC;CAC5B,GAAG,OAAO,CAAC,2BAA2B,CAAC,CA6CvC;AAsED,wBAAsB,gBAAgB,CAAC,EACrC,QAAQ,EACR,OAAO,EACP,YAAY,EACZ,QAAQ,EACR,OAAO,EACP,OAAO,EACP,QAA2B,EAC3B,SAAS,GACV,EAAE,qBAAqB,GAAG;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,YAAY,CAAC;CAC5B,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAwCvC;AAED;;GAEG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,OAAO,CAAS;IAExB;;;;OAIG;gBACS,EACV,YAAY,EACZ,OAAO,GACR,EAAE;QACD,YAAY,EAAE,YAAY,CAAC;QAC3B,OAAO,EAAE,MAAM,CAAC;KACjB;IAKD;;;;;OAKG;IACG,gBAAgB,CAAC,EACrB,QAAQ,EACR,OAAO,GACR,EAAE;QACD,QAAQ,EAAE,OAAO,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;KACjB,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAStC;;;;OAIG;IACG,kBAAkB,CACtB,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,2BAA2B,CAAC;IASvC;;;;OAIG;IACG,mBAAmB,CACvB,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,2BAA2B,CAAC;CAQxC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/secondary/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAExC,MAAM,MAAM,cAAc,GAAG;IAE3B,QAAQ,EAAE,MAAM,CAAC;IAEjB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IAEvB,GAAG,EAAE,cAAc,CAAC;IAEpB,MAAM,EAAE,cAAc,CAAC;IAEvB,IAAI,EAAE,MAAM,OAAO,CAAC;QAElB,QAAQ,EAAE,MAAM,CAAC;QAEjB,KAAK,EAAE,MAAM,CAAC;KACf,CAAC,CAAC;CACJ,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAE3B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE;QAEX,MAAM,EAAE,MAAM,CAAC;QAEf,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IAEF,KAAK,EAAE,UAAU,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAEjC,QAAQ,EAAE,OAAO,CAAC;IAElB,OAAO,EAAE,MAAM,CAAC;IAEhB,QAAQ,EAAE,MAAM,CAAC;IAEjB,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC;IAE3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,SAAS,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/secondary/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAExC,MAAM,MAAM,cAAc,GAAG;IAE3B,QAAQ,EAAE,MAAM,CAAC;IAEjB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IAEvB,GAAG,EAAE,cAAc,CAAC;IAEpB,MAAM,EAAE,cAAc,CAAC;IAEvB,IAAI,EAAE,MAAM,OAAO,CAAC;QAElB,QAAQ,EAAE,MAAM,CAAC;QAEjB,KAAK,EAAE,MAAM,CAAC;KACf,CAAC,CAAC;CACJ,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAE3B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE;QAEX,MAAM,EAAE,MAAM,CAAC;QAEf,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IAEF,KAAK,EAAE,UAAU,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAEjC,QAAQ,EAAE,OAAO,CAAC;IAElB,OAAO,EAAE,MAAM,CAAC;IAEhB,QAAQ,EAAE,MAAM,CAAC;IAEjB,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC;IAE3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAGF,MAAM,MAAM,qBAAqB,GAAG,oBAAoB,CAAC;AAGzD,MAAM,MAAM,aAAa,GAAG;IAE1B,kBAAkB,EAAE,OAAO,CAAC;IAE5B,IAAI,EAAE,OAAO,CAAC;IAEd,MAAM,EAAE,OAAO,CAAC;IAEhB,IAAI,EAAE,MAAM,CAAC;IAEb,MAAM,EAAE,MAAM,CAAC;IAEf,SAAS,EAAE,MAAM,CAAC;IAElB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAElC,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC"}
|
package/dist/test-utils.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { zoraCreator1155FactoryImplAddress } from "@zoralabs/protocol-deployments";
|
|
2
2
|
import { Address, Hex, PublicClient } from "viem";
|
|
3
|
-
|
|
4
|
-
export declare const waitForSuccess: (hash: Hex, publicClient: PublicClient) => Promise<import("viem").TransactionReceipt>;
|
|
3
|
+
export declare const waitForSuccess: (hash: Hex, publicClient: PublicClient) => Promise<void>;
|
|
5
4
|
export declare const getFixedPricedMinter: ({ publicClient, chainId, }: {
|
|
6
5
|
publicClient: PublicClient;
|
|
7
6
|
chainId: keyof typeof zoraCreator1155FactoryImplAddress;
|
|
@@ -9,7 +8,4 @@ export declare const getFixedPricedMinter: ({ publicClient, chainId, }: {
|
|
|
9
8
|
export declare const fixedPriceMinterMinterArguments: ({ mintRecipient, }: {
|
|
10
9
|
mintRecipient: Address;
|
|
11
10
|
}) => `0x${string}`;
|
|
12
|
-
export declare function randomNewContract(): NewContractParams;
|
|
13
|
-
export declare const randomNonce: () => `0x${string}`;
|
|
14
|
-
export declare const thirtySecondsFromNow: () => bigint;
|
|
15
11
|
//# sourceMappingURL=test-utils.d.ts.map
|
package/dist/test-utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["../src/test-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iCAAiC,EAClC,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,OAAO,EACP,GAAG,EACH,YAAY,
|
|
1
|
+
{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["../src/test-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iCAAiC,EAClC,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,OAAO,EACP,GAAG,EACH,YAAY,EAGb,MAAM,MAAM,CAAC;AAGd,eAAO,MAAM,cAAc,SAAgB,GAAG,gBAAgB,YAAY,kBAMzE,CAAC;AAEF,eAAO,MAAM,oBAAoB,+BAG9B;IACD,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,OAAO,iCAAiC,CAAC;CACzD,2BAKG,CAAC;AAEL,eAAO,MAAM,+BAA+B,uBAEzC;IACD,aAAa,EAAE,OAAO,CAAC;CACxB,kBAAwE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zoralabs/protocol-sdk",
|
|
3
|
-
"version": "0.11.7
|
|
3
|
+
"version": "0.11.7",
|
|
4
4
|
"repository": "https://github.com/ourzora/zora-protocol",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -16,11 +16,11 @@
|
|
|
16
16
|
}
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"
|
|
19
|
+
"abitype": "^1.0.2",
|
|
20
|
+
"@zoralabs/protocol-deployments": "^0.3.8"
|
|
20
21
|
},
|
|
21
22
|
"peerDependencies": {
|
|
22
|
-
"viem": "^2.21.21"
|
|
23
|
-
"abitype": "^1.0.2"
|
|
23
|
+
"viem": "^2.21.21"
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
26
26
|
"@lavamoat/preinstall-always-fail": "2.0.0",
|
|
@@ -21,13 +21,16 @@ import {
|
|
|
21
21
|
import { zora } from "viem/chains";
|
|
22
22
|
import { AllowList } from "src/allow-list/types";
|
|
23
23
|
import { createAllowList } from "src/allow-list/allow-list-client";
|
|
24
|
+
import { NewContractParams } from "./types";
|
|
24
25
|
import { SubgraphContractGetter } from "./contract-getter";
|
|
25
26
|
import {
|
|
26
27
|
DEFAULT_MINIMUM_MARKET_ETH,
|
|
27
28
|
DEFAULT_MARKET_COUNTDOWN,
|
|
28
29
|
} from "./minter-defaults";
|
|
29
|
-
import {
|
|
30
|
-
|
|
30
|
+
import {
|
|
31
|
+
demoContractMetadataURI,
|
|
32
|
+
demoTokenMetadataURI,
|
|
33
|
+
} from "src/fixtures/contract-setup";
|
|
31
34
|
|
|
32
35
|
const anvilTest = makeAnvilTest({
|
|
33
36
|
forkUrl: forkUrls.zoraMainnet,
|
|
@@ -58,6 +61,13 @@ const minterIsMinterOnToken = async ({
|
|
|
58
61
|
});
|
|
59
62
|
};
|
|
60
63
|
|
|
64
|
+
function randomNewContract(): NewContractParams {
|
|
65
|
+
return {
|
|
66
|
+
name: `testContract-${Math.round(Math.random() * 1_000_000)}`,
|
|
67
|
+
uri: demoContractMetadataURI,
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
|
|
61
71
|
describe("create-helper", () => {
|
|
62
72
|
anvilTest(
|
|
63
73
|
"when no sales config is provided, it creates a new 1155 contract and token using the timed sale strategy",
|
|
@@ -238,7 +238,6 @@ async function createNew1155ContractAndToken({
|
|
|
238
238
|
publicClient,
|
|
239
239
|
chainId,
|
|
240
240
|
}),
|
|
241
|
-
chainId,
|
|
242
241
|
});
|
|
243
242
|
|
|
244
243
|
return {
|
|
@@ -295,7 +294,6 @@ async function createNew1155Token({
|
|
|
295
294
|
result: newToken.salesConfig,
|
|
296
295
|
tokenId: nextTokenId,
|
|
297
296
|
getContractMintFee: async () => mintFee,
|
|
298
|
-
chainId,
|
|
299
297
|
});
|
|
300
298
|
|
|
301
299
|
return {
|
|
@@ -75,7 +75,6 @@ export function makeOnchainPrepareMintFromCreate({
|
|
|
75
75
|
minter,
|
|
76
76
|
getContractMintFee,
|
|
77
77
|
contractVersion,
|
|
78
|
-
chainId,
|
|
79
78
|
}: {
|
|
80
79
|
contractAddress: Address;
|
|
81
80
|
tokenId: bigint;
|
|
@@ -83,7 +82,6 @@ export function makeOnchainPrepareMintFromCreate({
|
|
|
83
82
|
minter: Address;
|
|
84
83
|
getContractMintFee: () => Promise<bigint>;
|
|
85
84
|
contractVersion: string;
|
|
86
|
-
chainId: number;
|
|
87
85
|
}): AsyncPrepareMint {
|
|
88
86
|
return async (params: MintParametersBase): Promise<PrepareMintReturn> => {
|
|
89
87
|
const subgraphSalesConfig = await toSalesStrategyFromSubgraph({
|
|
@@ -100,7 +98,6 @@ export function makeOnchainPrepareMintFromCreate({
|
|
|
100
98
|
...params,
|
|
101
99
|
tokenContract: contractAddress,
|
|
102
100
|
tokenId,
|
|
103
|
-
chainId,
|
|
104
101
|
}),
|
|
105
102
|
costs: parseMintCosts({
|
|
106
103
|
allowListEntry: params.allowListEntry,
|
|
@@ -1,28 +1,16 @@
|
|
|
1
1
|
import { describe, expect, vi } from "vitest";
|
|
2
|
-
import {
|
|
3
|
-
Address,
|
|
4
|
-
erc20Abi,
|
|
5
|
-
parseAbi,
|
|
6
|
-
parseEther,
|
|
7
|
-
TransactionReceipt,
|
|
8
|
-
parseEventLogs,
|
|
9
|
-
} from "viem";
|
|
2
|
+
import { Address, erc20Abi, parseAbi, parseEther } from "viem";
|
|
10
3
|
import { zora, zoraSepolia } from "viem/chains";
|
|
11
|
-
import {
|
|
12
|
-
zoraCreator1155ImplABI,
|
|
13
|
-
CommentIdentifier,
|
|
14
|
-
commentsABI,
|
|
15
|
-
callerAndCommenterABI,
|
|
16
|
-
} from "@zoralabs/protocol-deployments";
|
|
4
|
+
import { zoraCreator1155ImplABI } from "@zoralabs/protocol-deployments";
|
|
17
5
|
import { forkUrls, makeAnvilTest, writeContractWithRetries } from "src/anvil";
|
|
18
6
|
import { createCollectorClient, createCreatorClient } from "src/sdk";
|
|
19
7
|
import { getAllowListEntry } from "src/allow-list/allow-list-client";
|
|
20
|
-
import { SubgraphMintGetter } from "./subgraph-mint-getter";
|
|
21
|
-
import { new1155ContractVersion } from "src/create/contract-setup";
|
|
22
8
|
import {
|
|
23
9
|
demoContractMetadataURI,
|
|
24
10
|
demoTokenMetadataURI,
|
|
25
|
-
} from "src/
|
|
11
|
+
} from "src/create/1155-create-helper.test";
|
|
12
|
+
import { SubgraphMintGetter } from "./subgraph-mint-getter";
|
|
13
|
+
import { new1155ContractVersion } from "src/create/contract-setup";
|
|
26
14
|
import { ISubgraphQuerier } from "src/apis/subgraph-querier";
|
|
27
15
|
import { mockTimedSaleStrategyTokenQueryResult } from "src/fixtures/mint-query-results";
|
|
28
16
|
|
|
@@ -30,64 +18,52 @@ const erc721ABI = parseAbi([
|
|
|
30
18
|
"function balanceOf(address owner) public view returns (uint256)",
|
|
31
19
|
] as const);
|
|
32
20
|
|
|
33
|
-
const getCommentIdentifierFromReceipt = (
|
|
34
|
-
receipt: TransactionReceipt,
|
|
35
|
-
): CommentIdentifier => {
|
|
36
|
-
const logs = parseEventLogs({
|
|
37
|
-
abi: commentsABI,
|
|
38
|
-
logs: receipt.logs,
|
|
39
|
-
eventName: "Commented",
|
|
40
|
-
});
|
|
41
|
-
|
|
42
|
-
if (logs.length === 0) {
|
|
43
|
-
throw new Error("No Commented event found in receipt");
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
return logs[0]!.args.commentIdentifier;
|
|
47
|
-
};
|
|
48
|
-
|
|
49
21
|
describe("mint-helper", () => {
|
|
50
22
|
makeAnvilTest({
|
|
51
|
-
forkBlockNumber:
|
|
52
|
-
forkUrl: forkUrls.
|
|
53
|
-
anvilChainId:
|
|
23
|
+
forkBlockNumber: 16028671,
|
|
24
|
+
forkUrl: forkUrls.zoraMainnet,
|
|
25
|
+
anvilChainId: zora.id,
|
|
54
26
|
})(
|
|
55
|
-
"mints a new 1155 token
|
|
27
|
+
"mints a new 1155 token",
|
|
56
28
|
async ({ viemClients }) => {
|
|
57
|
-
const { testClient, walletClient, publicClient
|
|
29
|
+
const { testClient, walletClient, publicClient } = viemClients;
|
|
58
30
|
const creatorAccount = (await walletClient.getAddresses())[0]!;
|
|
59
31
|
await testClient.setBalance({
|
|
60
32
|
address: creatorAccount,
|
|
61
33
|
value: parseEther("2000"),
|
|
62
34
|
});
|
|
63
35
|
const targetContract: Address =
|
|
64
|
-
"
|
|
65
|
-
const targetTokenId =
|
|
36
|
+
"0xa2fea3537915dc6c7c7a97a82d1236041e6feb2e";
|
|
37
|
+
const targetTokenId = 1n;
|
|
66
38
|
const collectorClient = createCollectorClient({
|
|
67
|
-
chainId:
|
|
39
|
+
chainId: zora.id,
|
|
68
40
|
publicClient,
|
|
69
41
|
});
|
|
70
42
|
|
|
71
|
-
const {
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
43
|
+
const {
|
|
44
|
+
token: mintable,
|
|
45
|
+
prepareMint,
|
|
46
|
+
primaryMintActive,
|
|
47
|
+
} = await collectorClient.getToken({
|
|
48
|
+
tokenContract: targetContract,
|
|
49
|
+
mintType: "1155",
|
|
50
|
+
tokenId: targetTokenId,
|
|
51
|
+
});
|
|
52
|
+
|
|
53
|
+
mintable.maxSupply;
|
|
54
|
+
mintable.totalMinted;
|
|
55
|
+
mintable.tokenURI;
|
|
56
|
+
mintable;
|
|
78
57
|
|
|
79
58
|
expect(primaryMintActive).toBe(true);
|
|
80
59
|
expect(prepareMint).toBeDefined();
|
|
81
60
|
|
|
82
|
-
const quantityToMint = 5n;
|
|
83
|
-
|
|
84
61
|
const { parameters, costs } = prepareMint!({
|
|
85
62
|
minterAccount: creatorAccount,
|
|
86
|
-
quantityToMint,
|
|
87
|
-
mintComment: "This is a fun comment :)",
|
|
63
|
+
quantityToMint: 1,
|
|
88
64
|
});
|
|
89
65
|
|
|
90
|
-
expect(costs.totalCostEth).toBe(
|
|
66
|
+
expect(costs.totalCostEth).toBe(1n * parseEther("0.000777"));
|
|
91
67
|
|
|
92
68
|
const oldBalance = await publicClient.readContract({
|
|
93
69
|
abi: zoraCreator1155ImplABI,
|
|
@@ -108,20 +84,7 @@ describe("mint-helper", () => {
|
|
|
108
84
|
});
|
|
109
85
|
expect(receipt).to.not.be.null;
|
|
110
86
|
expect(oldBalance).to.be.equal(0n);
|
|
111
|
-
expect(newBalance).to.be.equal(
|
|
112
|
-
|
|
113
|
-
// search for the Commented event in the logs
|
|
114
|
-
const commentIdentifier = getCommentIdentifierFromReceipt(receipt);
|
|
115
|
-
|
|
116
|
-
expect(commentIdentifier).toBeDefined();
|
|
117
|
-
|
|
118
|
-
const logs = parseEventLogs({
|
|
119
|
-
abi: callerAndCommenterABI,
|
|
120
|
-
logs: receipt.logs,
|
|
121
|
-
eventName: "MintedAndCommented",
|
|
122
|
-
});
|
|
123
|
-
|
|
124
|
-
expect(logs.length).toBe(1);
|
|
87
|
+
expect(newBalance).to.be.equal(1n);
|
|
125
88
|
},
|
|
126
89
|
12 * 1000,
|
|
127
90
|
);
|
package/src/mint/mint-client.ts
CHANGED
|
@@ -24,22 +24,19 @@ export class MintClient {
|
|
|
24
24
|
private readonly publicClient: IPublicClient;
|
|
25
25
|
private readonly mintGetter: IOnchainMintGetter;
|
|
26
26
|
private readonly premintGetter: IPremintGetter;
|
|
27
|
-
|
|
27
|
+
|
|
28
28
|
constructor({
|
|
29
29
|
publicClient,
|
|
30
30
|
premintGetter,
|
|
31
31
|
mintGetter,
|
|
32
|
-
chainId,
|
|
33
32
|
}: {
|
|
34
33
|
publicClient: IPublicClient;
|
|
35
34
|
premintGetter: IPremintGetter;
|
|
36
35
|
mintGetter: IOnchainMintGetter;
|
|
37
|
-
chainId: number;
|
|
38
36
|
}) {
|
|
39
37
|
this.publicClient = publicClient;
|
|
40
38
|
this.mintGetter = mintGetter;
|
|
41
39
|
this.premintGetter = premintGetter;
|
|
42
|
-
this.chainId = chainId;
|
|
43
40
|
}
|
|
44
41
|
|
|
45
42
|
/**
|
|
@@ -57,7 +54,6 @@ export class MintClient {
|
|
|
57
54
|
publicClient: this.publicClient,
|
|
58
55
|
mintGetter: this.mintGetter,
|
|
59
56
|
premintGetter: this.premintGetter,
|
|
60
|
-
chainId: this.chainId,
|
|
61
57
|
});
|
|
62
58
|
}
|
|
63
59
|
|
|
@@ -73,7 +69,6 @@ export class MintClient {
|
|
|
73
69
|
mintGetter: this.mintGetter,
|
|
74
70
|
premintGetter: this.premintGetter,
|
|
75
71
|
publicClient: this.publicClient,
|
|
76
|
-
chainId: this.chainId,
|
|
77
72
|
});
|
|
78
73
|
}
|
|
79
74
|
|
|
@@ -92,7 +87,6 @@ export class MintClient {
|
|
|
92
87
|
mintGetter: this.mintGetter,
|
|
93
88
|
premintGetter: this.premintGetter,
|
|
94
89
|
publicClient: this.publicClient,
|
|
95
|
-
chainId: this.chainId,
|
|
96
90
|
});
|
|
97
91
|
}
|
|
98
92
|
|
|
@@ -116,20 +110,17 @@ async function mint({
|
|
|
116
110
|
publicClient,
|
|
117
111
|
mintGetter,
|
|
118
112
|
premintGetter,
|
|
119
|
-
chainId,
|
|
120
113
|
}: {
|
|
121
114
|
parameters: MakeMintParametersArguments;
|
|
122
115
|
publicClient: IPublicClient;
|
|
123
116
|
mintGetter: IOnchainMintGetter;
|
|
124
117
|
premintGetter: IPremintGetter;
|
|
125
|
-
chainId: number;
|
|
126
118
|
}): Promise<PrepareMintReturn> {
|
|
127
119
|
const { prepareMint, primaryMintActive } = await getMint({
|
|
128
120
|
params: parameters,
|
|
129
121
|
mintGetter,
|
|
130
122
|
premintGetter,
|
|
131
123
|
publicClient,
|
|
132
|
-
chainId,
|
|
133
124
|
});
|
|
134
125
|
|
|
135
126
|
if (!primaryMintActive) {
|
package/src/mint/mint-queries.ts
CHANGED
|
@@ -36,13 +36,11 @@ export async function getMint({
|
|
|
36
36
|
mintGetter,
|
|
37
37
|
premintGetter,
|
|
38
38
|
publicClient,
|
|
39
|
-
chainId,
|
|
40
39
|
}: {
|
|
41
40
|
params: GetMintParameters;
|
|
42
41
|
mintGetter: IOnchainMintGetter;
|
|
43
42
|
premintGetter: IPremintGetter;
|
|
44
43
|
publicClient: IPublicClient;
|
|
45
|
-
chainId: number;
|
|
46
44
|
}): Promise<MintableReturn> {
|
|
47
45
|
const { tokenContract } = params;
|
|
48
46
|
if (isOnChainMint(params)) {
|
|
@@ -55,7 +53,7 @@ export async function getMint({
|
|
|
55
53
|
blockTime: blockTime,
|
|
56
54
|
});
|
|
57
55
|
|
|
58
|
-
return toMintableReturn(result
|
|
56
|
+
return toMintableReturn(result);
|
|
59
57
|
}
|
|
60
58
|
|
|
61
59
|
const premint = await premintGetter.get({
|
|
@@ -105,19 +103,17 @@ export async function getMintsOfContract({
|
|
|
105
103
|
mintGetter,
|
|
106
104
|
premintGetter,
|
|
107
105
|
publicClient,
|
|
108
|
-
chainId,
|
|
109
106
|
}: {
|
|
110
107
|
params: GetMintsOfContractParameters;
|
|
111
108
|
mintGetter: IOnchainMintGetter;
|
|
112
109
|
premintGetter: IPremintGetter;
|
|
113
110
|
publicClient: IPublicClient;
|
|
114
|
-
chainId: number;
|
|
115
111
|
}): Promise<{ contract?: ContractInfo; tokens: MintableReturn[] }> {
|
|
116
112
|
const onchainMints = (
|
|
117
113
|
await mintGetter.getContractMintable({
|
|
118
114
|
tokenAddress: params.tokenContract,
|
|
119
115
|
})
|
|
120
|
-
).map(
|
|
116
|
+
).map(toMintableReturn);
|
|
121
117
|
|
|
122
118
|
const offchainMints = await getPremintsOfContractMintable({
|
|
123
119
|
mintGetter,
|
|
@@ -274,7 +270,7 @@ function parsePremint({
|
|
|
274
270
|
}
|
|
275
271
|
|
|
276
272
|
export const makeOnchainPrepareMint =
|
|
277
|
-
(result: OnchainSalesConfigAndTokenInfo
|
|
273
|
+
(result: OnchainSalesConfigAndTokenInfo): PrepareMint =>
|
|
278
274
|
(params: MintParametersBase) => {
|
|
279
275
|
if (!result.salesConfig) {
|
|
280
276
|
throw new Error("No valid sales config found for token");
|
|
@@ -284,7 +280,6 @@ export const makeOnchainPrepareMint =
|
|
|
284
280
|
parameters: makeOnchainMintCall({
|
|
285
281
|
token: result as Concrete<OnchainSalesConfigAndTokenInfo>,
|
|
286
282
|
mintParams: params,
|
|
287
|
-
chainId,
|
|
288
283
|
}),
|
|
289
284
|
erc20Approval: getRequiredErc20Approvals(params, result.salesConfig),
|
|
290
285
|
costs: parseMintCosts({
|
|
@@ -295,10 +290,7 @@ export const makeOnchainPrepareMint =
|
|
|
295
290
|
};
|
|
296
291
|
};
|
|
297
292
|
|
|
298
|
-
function toMintableReturn(
|
|
299
|
-
result: GetMintableReturn,
|
|
300
|
-
chainId: number,
|
|
301
|
-
): MintableReturn {
|
|
293
|
+
function toMintableReturn(result: GetMintableReturn): MintableReturn {
|
|
302
294
|
const primaryMintActive = result.primaryMintActive;
|
|
303
295
|
if (!primaryMintActive) {
|
|
304
296
|
return {
|
|
@@ -314,10 +306,7 @@ function toMintableReturn(
|
|
|
314
306
|
primaryMintActive,
|
|
315
307
|
primaryMintEnd: result.primaryMintEnd,
|
|
316
308
|
secondaryMarketActive: result.secondaryMarketActive,
|
|
317
|
-
prepareMint: makeOnchainPrepareMint(
|
|
318
|
-
result.salesConfigAndTokenInfo,
|
|
319
|
-
chainId,
|
|
320
|
-
),
|
|
309
|
+
prepareMint: makeOnchainPrepareMint(result.salesConfigAndTokenInfo),
|
|
321
310
|
};
|
|
322
311
|
}
|
|
323
312
|
|