From 20a27203f7c0e04271e1c634fae8e1f27ce565ff Mon Sep 17 00:00:00 2001 From: Yash Date: Tue, 12 Mar 2024 15:56:00 +0530 Subject: [PATCH 1/4] Contracts version 3.11.1 --- packages/contracts-js/package.json | 18 ++++++------- .../evm/core/classes/drop-claim-conditions.ts | 11 +++++--- .../classes/drop-erc1155-claim-conditions.ts | 11 +++++--- packages/sdk/test/evm/account.test.ts | 2 +- packages/sdk/test/evm/before-setup.ts | 3 +-- packages/sdk/test/evm/edition-drop-v4.test.ts | 4 +-- packages/sdk/test/evm/nft-drop-v4.test.ts | 21 ++++++++------- .../sdk/test/evm/signature-drop-v5.test.ts | 10 +++---- packages/sdk/test/evm/token-drop-v4.test.ts | 8 +++--- pnpm-lock.yaml | 27 +++++-------------- 10 files changed, 56 insertions(+), 59 deletions(-) diff --git a/packages/contracts-js/package.json b/packages/contracts-js/package.json index a2358beba53..22bd7d3b55e 100644 --- a/packages/contracts-js/package.json +++ b/packages/contracts-js/package.json @@ -95,7 +95,6 @@ "./dist/abis/IClaimCondition_V1.json": "./dist/abis/IClaimCondition_V1.json", "./dist/abis/IERC1155.json": "./dist/abis/IERC1155.json", "./dist/abis/IStaking1155.json": "./dist/abis/IStaking1155.json", - "./dist/abis/Math.json": "./dist/abis/Math.json", "./dist/abis/IRoyaltyEngineV1.json": "./dist/abis/IRoyaltyEngineV1.json", "./dist/abis/DelayedRevealStorage.json": "./dist/abis/DelayedRevealStorage.json", "./dist/abis/ISignatureMintERC1155.json": "./dist/abis/ISignatureMintERC1155.json", @@ -106,7 +105,6 @@ "./dist/abis/IERC1155Receiver.json": "./dist/abis/IERC1155Receiver.json", "./dist/abis/IERC4906.json": "./dist/abis/IERC4906.json", "./dist/abis/ERC2771ContextLogic.json": "./dist/abis/ERC2771ContextLogic.json", - "./dist/abis/TWBitMaps.json": "./dist/abis/TWBitMaps.json", "./dist/abis/IERC2981.json": "./dist/abis/IERC2981.json", "./dist/abis/ILazyMintWithTier.json": "./dist/abis/ILazyMintWithTier.json", "./dist/abis/ERC721SignatureMint.json": "./dist/abis/ERC721SignatureMint.json", @@ -129,11 +127,9 @@ "./dist/abis/AirdropERC721.json": "./dist/abis/AirdropERC721.json", "./dist/abis/IDropSinglePhase.json": "./dist/abis/IDropSinglePhase.json", "./dist/abis/zora_IERC721Drop.json": "./dist/abis/zora_IERC721Drop.json", - "./dist/abis/TWStringSet.json": "./dist/abis/TWStringSet.json", "./dist/abis/InitStorage.json": "./dist/abis/InitStorage.json", "./dist/abis/IDropSinglePhase1155.json": "./dist/abis/IDropSinglePhase1155.json", "./dist/abis/AccountCore.json": "./dist/abis/AccountCore.json", - "./dist/abis/TWStorageSlot.json": "./dist/abis/TWStorageSlot.json", "./dist/abis/TWMinimalFactory.json": "./dist/abis/TWMinimalFactory.json", "./dist/abis/TWRegistry.json": "./dist/abis/TWRegistry.json", "./dist/abis/OpenEditionERC721.json": "./dist/abis/OpenEditionERC721.json", @@ -155,8 +151,8 @@ "./dist/abis/Proxy.json": "./dist/abis/Proxy.json", "./dist/abis/ERC1967Proxy.json": "./dist/abis/ERC1967Proxy.json", "./dist/abis/IRoyaltyPayments.json": "./dist/abis/IRoyaltyPayments.json", + "./dist/abis/IERC721AQueryable.json": "./dist/abis/IERC721AQueryable.json", "./dist/abis/BaseRouter.json": "./dist/abis/BaseRouter.json", - "./dist/abis/TWAddress.json": "./dist/abis/TWAddress.json", "./dist/abis/EvolvingNFT.json": "./dist/abis/EvolvingNFT.json", "./dist/abis/ContractMetadata.json": "./dist/abis/ContractMetadata.json", "./dist/abis/IOffers.json": "./dist/abis/IOffers.json", @@ -200,7 +196,6 @@ "./dist/abis/IEntryPoint.json": "./dist/abis/IEntryPoint.json", "./dist/abis/EnglishAuctionsStorage.json": "./dist/abis/EnglishAuctionsStorage.json", "./dist/abis/IDropERC721_V3.json": "./dist/abis/IDropERC721_V3.json", - "./dist/abis/EIP712.json": "./dist/abis/EIP712.json", "./dist/abis/DelayedReveal.json": "./dist/abis/DelayedReveal.json", "./dist/abis/IAccount.json": "./dist/abis/IAccount.json", "./dist/abis/OffersStorage.json": "./dist/abis/OffersStorage.json", @@ -218,6 +213,7 @@ "./dist/abis/DynamicAccount.json": "./dist/abis/DynamicAccount.json", "./dist/abis/LoyaltyCard.json": "./dist/abis/LoyaltyCard.json", "./dist/abis/IClaimCondition.json": "./dist/abis/IClaimCondition.json", + "./dist/abis/StorageSlot.json": "./dist/abis/StorageSlot.json", "./dist/abis/IStaking721.json": "./dist/abis/IStaking721.json", "./dist/abis/IEnglishAuctions.json": "./dist/abis/IEnglishAuctions.json", "./dist/abis/TWMultichainRegistry.json": "./dist/abis/TWMultichainRegistry.json", @@ -234,7 +230,6 @@ "./dist/abis/IAirdropERC1155.json": "./dist/abis/IAirdropERC1155.json", "./dist/abis/OffersLogic.json": "./dist/abis/OffersLogic.json", "./dist/abis/Marketplace.json": "./dist/abis/Marketplace.json", - "./dist/abis/TWStrings.json": "./dist/abis/TWStrings.json", "./dist/abis/DirectListingsStorage.json": "./dist/abis/DirectListingsStorage.json", "./dist/abis/TieredDrop.json": "./dist/abis/TieredDrop.json", "./dist/abis/ERC1155Receiver.json": "./dist/abis/ERC1155Receiver.json", @@ -245,6 +240,7 @@ "./dist/abis/PermissionsInit.json": "./dist/abis/PermissionsInit.json", "./dist/abis/Account.json": "./dist/abis/Account.json", "./dist/abis/ERC20Base.json": "./dist/abis/ERC20Base.json", + "./dist/abis/Address.json": "./dist/abis/Address.json", "./dist/abis/INFTStake.json": "./dist/abis/INFTStake.json", "./dist/abis/BytesLib.json": "./dist/abis/BytesLib.json", "./dist/abis/LazyMintStorage.json": "./dist/abis/LazyMintStorage.json", @@ -309,6 +305,7 @@ "./dist/abis/ERC6551BytecodeLib.json": "./dist/abis/ERC6551BytecodeLib.json", "./dist/abis/TWMultichainRegistryStorage.json": "./dist/abis/TWMultichainRegistryStorage.json", "./dist/abis/ForwarderEOAOnly.json": "./dist/abis/ForwarderEOAOnly.json", + "./dist/abis/Strings.json": "./dist/abis/Strings.json", "./dist/abis/TokenStore.json": "./dist/abis/TokenStore.json", "./dist/abis/TokenBundle.json": "./dist/abis/TokenBundle.json", "./dist/abis/IPaymaster.json": "./dist/abis/IPaymaster.json", @@ -336,8 +333,10 @@ "./dist/abis/IMultiwrap.json": "./dist/abis/IMultiwrap.json", "./dist/abis/BurnToClaimDrop721Storage.json": "./dist/abis/BurnToClaimDrop721Storage.json", "./dist/abis/IBurnableERC721.json": "./dist/abis/IBurnableERC721.json", + "./dist/abis/OpenEditionERC721FlatFee.json": "./dist/abis/OpenEditionERC721FlatFee.json", "./dist/abis/AccountPermissionsStorage.json": "./dist/abis/AccountPermissionsStorage.json", "./dist/abis/FeeType.json": "./dist/abis/FeeType.json", + "./dist/abis/ERC721AQueryable.json": "./dist/abis/ERC721AQueryable.json", "./dist/abis/Split.json": "./dist/abis/Split.json", "./dist/abis/IERC20Metadata.json": "./dist/abis/IERC20Metadata.json", "./dist/abis/EditionStake.json": "./dist/abis/EditionStake.json", @@ -355,11 +354,11 @@ "./dist/abis/Base64.json": "./dist/abis/Base64.json", "./dist/abis/ProxyForUpgradeable.json": "./dist/abis/ProxyForUpgradeable.json", "./dist/abis/Helpers.json": "./dist/abis/Helpers.json", + "./dist/abis/StringSet.json": "./dist/abis/StringSet.json", "./dist/abis/VRFV2WrapperConsumerBase.json": "./dist/abis/VRFV2WrapperConsumerBase.json", "./dist/abis/ITokenERC1155.json": "./dist/abis/ITokenERC1155.json", "./dist/abis/BatchMintMetadata.json": "./dist/abis/BatchMintMetadata.json", "./dist/abis/NFTMetadata.json": "./dist/abis/NFTMetadata.json", - "./dist/abis/ERC20Permit.json": "./dist/abis/ERC20Permit.json", "./dist/abis/IAppURI.json": "./dist/abis/IAppURI.json", "./dist/abis/ERC1155DelayedReveal.json": "./dist/abis/ERC1155DelayedReveal.json", "./dist/abis/BatchMintMetadata_V1.json": "./dist/abis/BatchMintMetadata_V1.json", @@ -386,6 +385,7 @@ "./dist/abis/Ownable.json": "./dist/abis/Ownable.json", "./dist/abis/ERC721Base.json": "./dist/abis/ERC721Base.json", "./dist/abis/OperatorFilterToggleStorage.json": "./dist/abis/OperatorFilterToggleStorage.json", + "./dist/abis/BitMaps.json": "./dist/abis/BitMaps.json", "./dist/abis/NFTStake.json": "./dist/abis/NFTStake.json", "./dist/abis/ContractMetadataStorage.json": "./dist/abis/ContractMetadataStorage.json", "./dist/abis/DropERC20_V2.json": "./dist/abis/DropERC20_V2.json", @@ -423,7 +423,7 @@ "license": "Apache-2.0", "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/contracts-js", "dependencies": { - "@thirdweb-dev/contracts": "3.10.3" + "@thirdweb-dev/contracts": "3.11.1" }, "devDependencies": { "@babel/preset-env": "^7.23.8", diff --git a/packages/sdk/src/evm/core/classes/drop-claim-conditions.ts b/packages/sdk/src/evm/core/classes/drop-claim-conditions.ts index 43ffefb31dd..e51aca361c3 100644 --- a/packages/sdk/src/evm/core/classes/drop-claim-conditions.ts +++ b/packages/sdk/src/evm/core/classes/drop-claim-conditions.ts @@ -267,7 +267,8 @@ export class DropClaimConditions< } catch (err: any) { if ( includesErrorMessage(err, "!CONDITION") || - includesErrorMessage(err, "no active mint condition") + includesErrorMessage(err, "no active mint condition") || + includesErrorMessage(err, "DropNoActiveCondition") ) { reasons.push(ClaimEligibility.NoClaimConditionSet); return reasons; @@ -386,20 +387,24 @@ export class DropClaimConditions< } catch (e: any) { console.warn( "Merkle proof verification failed:", - "reason" in e ? e.reason : e, + "reason" in e ? e.reason || e.errorName : e, ); - const reason = (e as any).reason; + const reason = (e as any).reason || (e as any).errorName; switch (reason) { case "!Qty": + case "DropClaimExceedLimit": reasons.push(ClaimEligibility.OverMaxClaimablePerWallet); break; case "!PriceOrCurrency": + case "DropClaimInvalidTokenPrice": reasons.push(ClaimEligibility.WrongPriceOrCurrency); break; case "!MaxSupply": + case "DropClaimExceedMaxSupply": reasons.push(ClaimEligibility.NotEnoughSupply); break; case "cant claim yet": + case "DropClaimNotStarted": reasons.push(ClaimEligibility.ClaimPhaseNotStarted); break; default: { diff --git a/packages/sdk/src/evm/core/classes/drop-erc1155-claim-conditions.ts b/packages/sdk/src/evm/core/classes/drop-erc1155-claim-conditions.ts index 2af98a80e41..94800239c59 100644 --- a/packages/sdk/src/evm/core/classes/drop-erc1155-claim-conditions.ts +++ b/packages/sdk/src/evm/core/classes/drop-erc1155-claim-conditions.ts @@ -256,7 +256,8 @@ export class DropErc1155ClaimConditions< } catch (err: any) { if ( includesErrorMessage(err, "!CONDITION") || - includesErrorMessage(err, "no active mint condition") + includesErrorMessage(err, "no active mint condition") || + includesErrorMessage(err, "DropNoActiveCondition") ) { reasons.push(ClaimEligibility.NoClaimConditionSet); return reasons; @@ -374,20 +375,24 @@ export class DropErc1155ClaimConditions< } catch (e: any) { console.warn( "Merkle proof verification failed:", - "reason" in e ? e.reason : e, + "reason" in e ? e.reason || e.errorName : e, ); - const reason = (e as any).reason; + const reason = (e as any).reason || (e as any).errorName; switch (reason) { case "!Qty": + case "DropClaimExceedLimit": reasons.push(ClaimEligibility.OverMaxClaimablePerWallet); break; case "!PriceOrCurrency": + case "DropClaimInvalidTokenPrice": reasons.push(ClaimEligibility.WrongPriceOrCurrency); break; case "!MaxSupply": + case "DropClaimExceedMaxSupply": reasons.push(ClaimEligibility.NotEnoughSupply); break; case "cant claim yet": + case "DropClaimNotStarted": reasons.push(ClaimEligibility.ClaimPhaseNotStarted); break; default: { diff --git a/packages/sdk/test/evm/account.test.ts b/packages/sdk/test/evm/account.test.ts index 7a3ec28df6f..d93abefa488 100644 --- a/packages/sdk/test/evm/account.test.ts +++ b/packages/sdk/test/evm/account.test.ts @@ -64,7 +64,7 @@ describe("Accounts with account factory", function () { AccountFactory__factory.abi, AccountFactory__factory.bytecode, adminWallet, - [entrypoint.address], + [adminWallet.address, entrypoint.address], ); accountFactory = (await sdk.getContract(factoryAddress)).accountFactory; }); diff --git a/packages/sdk/test/evm/before-setup.ts b/packages/sdk/test/evm/before-setup.ts index c9662256e60..f583612560c 100644 --- a/packages/sdk/test/evm/before-setup.ts +++ b/packages/sdk/test/evm/before-setup.ts @@ -196,6 +196,7 @@ export const mochaHooks = { ) .connect(signer) .deploy( + signer.address, trustedForwarderAddress, mockPublisher.address, )) as ContractPublisher; // TODO needs MockPublisher here @@ -219,13 +220,11 @@ export const mochaHooks = { const addr = getNativeTokenByChainId(ChainId.Hardhat).wrapped.address; return await deployContractAndUploadMetadata(abi, bytecode, signer, [ addr, - trustedForwarderAddress, ]); default: return await deployContractAndUploadMetadata(abi, bytecode, signer); } } - for (const contractType in CONTRACTS_MAP) { if (contractType === "custom" || contractType === "marketplace-v3") { continue; diff --git a/packages/sdk/test/evm/edition-drop-v4.test.ts b/packages/sdk/test/evm/edition-drop-v4.test.ts index 72aabe5e0c8..f2b817cfefd 100644 --- a/packages/sdk/test/evm/edition-drop-v4.test.ts +++ b/packages/sdk/test/evm/edition-drop-v4.test.ts @@ -344,7 +344,7 @@ describe("Edition Drop Contract (V4)", async () => { await sdk.updateSignerOrProvider(w2); await bdContract.claim(0, 2); } catch (e) { - expectError(e, "!Qty"); + expectError(e, "DropClaimExceedLimit"); } }); @@ -695,7 +695,7 @@ describe("Edition Drop Contract (V4)", async () => { try { await bdContract.claim("1", 2); } catch (e) { - expectError(e, "!MaxSupply"); + expectError(e, "DropClaimExceedMaxSupply"); } }); diff --git a/packages/sdk/test/evm/nft-drop-v4.test.ts b/packages/sdk/test/evm/nft-drop-v4.test.ts index 4c4edde97c6..07064b5485f 100644 --- a/packages/sdk/test/evm/nft-drop-v4.test.ts +++ b/packages/sdk/test/evm/nft-drop-v4.test.ts @@ -68,7 +68,7 @@ describe("NFT Drop Contract (v4)", async () => { await dropContract.claim(2); expect.fail("should not be able to claim 2 - maxSupply"); } catch (e) { - expectError(e, "!MaxSupply"); + expectError(e, "DropClaimExceedMaxSupply"); } await dropContract.claim(1); // claiming with max per wallet @@ -84,7 +84,7 @@ describe("NFT Drop Contract (v4)", async () => { await dropContract.claim(2); expect.fail("should not be able to claim 2 - maxClaimablePerWallet"); } catch (e) { - expectError(e, "!Qty"); + expectError(e, "DropClaimExceedLimit"); } await dropContract.claim(1); expect((await dropContract.totalClaimedSupply()).toString()).eq("3"); @@ -127,7 +127,7 @@ describe("NFT Drop Contract (v4)", async () => { await dropContract.claim(1); expect.fail("should not be able to claim - not in allowlist"); } catch (e) { - expectError(e, "!Qty"); + expectError(e, "DropClaimExceedLimit"); } sdk.updateSignerOrProvider(adminWallet); await dropContract.claim(1); @@ -144,7 +144,7 @@ describe("NFT Drop Contract (v4)", async () => { await dropContract.claim(2); expect.fail("should not be able to claim - maxClaimableSupply"); } catch (e) { - expectError(e, "!MaxSupply"); + expectError(e, "DropClaimExceedMaxSupply"); } await dropContract.claim(1); // claiming with max per wallet @@ -161,7 +161,7 @@ describe("NFT Drop Contract (v4)", async () => { await dropContract.claim(2); expect.fail("should not be able to claim - maxClaimablePerWallet"); } catch (e) { - expectError(e, "!Qty"); + expectError(e, "DropClaimExceedLimit"); } await dropContract.claim(1); // claiming with max per wallet in snapshot @@ -178,14 +178,14 @@ describe("NFT Drop Contract (v4)", async () => { await dropContract.claim(2); expect.fail("should not be able to claim - proof maxClaimable"); } catch (e) { - expectError(e, "!Qty"); + expectError(e, "DropClaimExceedLimit"); } await dropContract.claim(1); try { await dropContract.claim(1); expect.fail("should not be able to claim - proof used"); } catch (e) { - expectError(e, "!Qty"); + expectError(e, "DropClaimExceedLimit"); } }); @@ -235,7 +235,7 @@ describe("NFT Drop Contract (v4)", async () => { await dropContract.claim(1); assert.fail("Should have thrown"); } catch (e) { - expectError(e, "!Qty"); + expectError(e, "DropClaimExceedLimit"); } }); @@ -538,7 +538,7 @@ describe("NFT Drop Contract (v4)", async () => { await dropContract.claim(1); assert.fail("should have thrown"); } catch (err: any) { - expectError(err, "!Qty"); + expectError(err, "DropClaimExceedLimit"); } }); @@ -590,7 +590,7 @@ describe("NFT Drop Contract (v4)", async () => { await sdk.updateSignerOrProvider(w2); await dropContract.claim(2); } catch (e) { - expectError(e, "!Qty"); + expectError(e, "DropClaimExceedLimit"); } }); @@ -758,6 +758,7 @@ describe("NFT Drop Contract (v4)", async () => { expect(reasons).to.include(ClaimEligibility.NoClaimConditionSet); assert.lengthOf(reasons, 1); + console.log(reasons); const canClaim = await dropContract.claimConditions.canClaim( 1, w1.address, diff --git a/packages/sdk/test/evm/signature-drop-v5.test.ts b/packages/sdk/test/evm/signature-drop-v5.test.ts index 26c52e142a3..2c98892db3c 100644 --- a/packages/sdk/test/evm/signature-drop-v5.test.ts +++ b/packages/sdk/test/evm/signature-drop-v5.test.ts @@ -527,8 +527,8 @@ describe("Signature drop tests (v5)", async () => { i % 3 === 0 ? w.address.toLowerCase() : i % 3 === 1 - ? w.address.toUpperCase().replace("0X", "0x") - : w.address, + ? w.address.toUpperCase().replace("0X", "0x") + : w.address, ) .map((a) => ({ address: a, @@ -597,7 +597,7 @@ describe("Signature drop tests (v5)", async () => { await signatureDropContract.claim(1); } catch (e) { // expected - expectError(e, "!Qty"); + expectError(e, "DropClaimExceedLimit"); } }); @@ -693,7 +693,7 @@ describe("Signature drop tests (v5)", async () => { try { await signatureDropContract.claim(1); } catch (err: any) { - expectError(err, "!Qty"); + expectError(err, "DropClaimExceedLimit"); } }); @@ -728,7 +728,7 @@ describe("Signature drop tests (v5)", async () => { await sdk.updateSignerOrProvider(w2); await signatureDropContract.claim(2); } catch (e) { - expectError(e, "!Qty"); + expectError(e, "DropClaimExceedLimit"); } }); diff --git a/packages/sdk/test/evm/token-drop-v4.test.ts b/packages/sdk/test/evm/token-drop-v4.test.ts index f1bd2f89c49..6b8ac800ffe 100644 --- a/packages/sdk/test/evm/token-drop-v4.test.ts +++ b/packages/sdk/test/evm/token-drop-v4.test.ts @@ -139,8 +139,8 @@ describe("Token Drop Contract (v4)", async () => { i % 3 === 0 ? w.address.toLowerCase() : i % 3 === 1 - ? w.address.toUpperCase().replace("0X", "0x") - : w.address, + ? w.address.toUpperCase().replace("0X", "0x") + : w.address, ); await dropContract.claimConditions.set([ { @@ -200,7 +200,7 @@ describe("Token Drop Contract (v4)", async () => { try { await dropContract.claim(1); } catch (err: any) { - expectError(err, "!Qty"); + expectError(err, "DropClaimExceedLimit"); } }); @@ -240,7 +240,7 @@ describe("Token Drop Contract (v4)", async () => { await sdk.updateSignerOrProvider(w2); await dropContract.claim(2); } catch (e) { - expectError(e, "!Qty"); + expectError(e, "DropClaimExceedLimit"); } }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a1c61450bad..2883f55c5ad 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -377,8 +377,8 @@ importers: packages/contracts-js: dependencies: '@thirdweb-dev/contracts': - specifier: 3.10.3 - version: 3.10.3(ethers@5.7.2) + specifier: 3.11.1 + version: 3.11.1(ethers@5.7.2) devDependencies: '@babel/preset-env': specifier: ^7.23.8 @@ -940,7 +940,7 @@ importers: optionalDependencies: amazon-cognito-identity-js: specifier: ^6.3.3 - version: 6.3.7 + version: 6.3.6 react-native-aes-gcm-crypto: specifier: ^0.2.2 version: 0.2.2(react-native@0.71.11)(react@18.2.0) @@ -8134,7 +8134,7 @@ packages: resolution: {integrity: sha512-tOZfTiIFA5KmMpdW9KF7bc6CFiGjb0xnbieJhTGlHrLL+ps2G0OkqmuZ3pFEXBOMnJYUVpnSy++52LFxvpa5ZQ==} dependencies: '@babel/code-frame': 7.10.4 - json5: 2.2.3 + json5: 1.0.2 write-file-atomic: 2.4.3 dev: false @@ -12323,8 +12323,8 @@ packages: use-sync-external-store: 1.2.0(react@18.2.0) dev: false - /@thirdweb-dev/contracts@3.10.3(ethers@5.7.2): - resolution: {integrity: sha512-wSVNaEoosn0AgUtnxlvv7rgK+3EUMzJm2ZasofPgJgqGS3gYH5nDBmK29VMquA2BLc38OAPyYMWc/iQCiCikMg==} + /@thirdweb-dev/contracts@3.11.1(ethers@5.7.2): + resolution: {integrity: sha512-tcOlL52QNZQrHZJgU6yygDQxOLlS+Mq3UNDxlalQ0rDm1iIKs31fdUqqkYFtF52Qek3b0JXRKf9/dTYldcGZhg==} engines: {node: '>=18.0.0'} dependencies: '@chainlink/contracts': 0.6.1(ethers@5.7.2) @@ -14237,18 +14237,6 @@ packages: /amazon-cognito-identity-js@6.3.6: resolution: {integrity: sha512-kBq+GE6OkLrxtFj3ZduIOlKBFYeOqZK3EhxbDBkv476UTvy+uwfR0tlriTq2QzNdnvlQAjBIXnXuOM7DwR1UEQ==} - dependencies: - '@aws-crypto/sha256-js': 1.2.2 - buffer: 4.9.2 - fast-base64-decode: 1.0.0 - isomorphic-unfetch: 3.1.0 - js-cookie: 2.2.1 - transitivePeerDependencies: - - encoding - dev: false - - /amazon-cognito-identity-js@6.3.7: - resolution: {integrity: sha512-tSjnM7KyAeOZ7UMah+oOZ6cW4Gf64FFcc7BE2l7MTcp7ekAPrXaCbpcW2xEpH1EiDS4cPcAouHzmCuc2tr72vQ==} requiresBuild: true dependencies: '@aws-crypto/sha256-js': 1.2.2 @@ -14259,7 +14247,6 @@ packages: transitivePeerDependencies: - encoding dev: false - optional: true /anser@1.4.10: resolution: {integrity: sha512-hCv9AqTQ8ycjpSd3upOJd7vFwW1JaoYQ7tpham03GJ1ca8/65rqn0RpaWpItOAd6ylW9wAw6luXYPJIyPFVOww==} @@ -26571,7 +26558,7 @@ packages: engines: {node: '>=12.0.0'} hasBin: true peerDependencies: - protobufjs: '>=7.2.4' + protobufjs: ^7.0.0 dependencies: chalk: 4.1.2 escodegen: 1.14.3 From 85a6e338295c80cc166df7f8bffd5a7774628ba3 Mon Sep 17 00:00:00 2001 From: Yash Date: Tue, 12 Mar 2024 15:56:29 +0530 Subject: [PATCH 2/4] changeset --- .changeset/plenty-bulldogs-sparkle.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/plenty-bulldogs-sparkle.md diff --git a/.changeset/plenty-bulldogs-sparkle.md b/.changeset/plenty-bulldogs-sparkle.md new file mode 100644 index 00000000000..8a2f77bb759 --- /dev/null +++ b/.changeset/plenty-bulldogs-sparkle.md @@ -0,0 +1,6 @@ +--- +"@thirdweb-dev/contracts-js": patch +"@thirdweb-dev/sdk": patch +--- + +Contracts version 3.11.1 From 1661fb62cbb5b3bb1c15c355e833a45dae237a5e Mon Sep 17 00:00:00 2001 From: Yash Date: Tue, 12 Mar 2024 23:29:54 +0530 Subject: [PATCH 3/4] v3.11.2 --- packages/contracts-js/package.json | 3 +-- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/contracts-js/package.json b/packages/contracts-js/package.json index 22bd7d3b55e..46a3ae6bfdc 100644 --- a/packages/contracts-js/package.json +++ b/packages/contracts-js/package.json @@ -353,7 +353,6 @@ "./dist/abis/IPlatformFee.json": "./dist/abis/IPlatformFee.json", "./dist/abis/Base64.json": "./dist/abis/Base64.json", "./dist/abis/ProxyForUpgradeable.json": "./dist/abis/ProxyForUpgradeable.json", - "./dist/abis/Helpers.json": "./dist/abis/Helpers.json", "./dist/abis/StringSet.json": "./dist/abis/StringSet.json", "./dist/abis/VRFV2WrapperConsumerBase.json": "./dist/abis/VRFV2WrapperConsumerBase.json", "./dist/abis/ITokenERC1155.json": "./dist/abis/ITokenERC1155.json", @@ -423,7 +422,7 @@ "license": "Apache-2.0", "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/contracts-js", "dependencies": { - "@thirdweb-dev/contracts": "3.11.1" + "@thirdweb-dev/contracts": "3.11.2" }, "devDependencies": { "@babel/preset-env": "^7.23.8", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2883f55c5ad..c20b8328d34 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -377,8 +377,8 @@ importers: packages/contracts-js: dependencies: '@thirdweb-dev/contracts': - specifier: 3.11.1 - version: 3.11.1(ethers@5.7.2) + specifier: 3.11.2 + version: 3.11.2(ethers@5.7.2) devDependencies: '@babel/preset-env': specifier: ^7.23.8 @@ -12323,8 +12323,8 @@ packages: use-sync-external-store: 1.2.0(react@18.2.0) dev: false - /@thirdweb-dev/contracts@3.11.1(ethers@5.7.2): - resolution: {integrity: sha512-tcOlL52QNZQrHZJgU6yygDQxOLlS+Mq3UNDxlalQ0rDm1iIKs31fdUqqkYFtF52Qek3b0JXRKf9/dTYldcGZhg==} + /@thirdweb-dev/contracts@3.11.2(ethers@5.7.2): + resolution: {integrity: sha512-rwPFko1BJ1w4sZ6DxULCFqAaR1HObj3xEhUoQErLuhdTw+77g8Ymg4ZNVuzaSDfQZzqecLiF/YL7h/9z/zEfCQ==} engines: {node: '>=18.0.0'} dependencies: '@chainlink/contracts': 0.6.1(ethers@5.7.2) @@ -18277,7 +18277,7 @@ packages: minimatch: 3.1.2 object.values: 1.1.6 resolve: 1.22.1 - semver: 7.6.0 + semver: 7.5.4 tsconfig-paths: 3.14.2 transitivePeerDependencies: - eslint-import-resolver-typescript From 705a9429f49eeb49763a11504286ab41b9e13b36 Mon Sep 17 00:00:00 2001 From: Yash Date: Fri, 15 Mar 2024 00:13:36 +0530 Subject: [PATCH 4/4] fix tests --- packages/sdk/test/evm/custom.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sdk/test/evm/custom.test.ts b/packages/sdk/test/evm/custom.test.ts index d7654029255..553332800b9 100644 --- a/packages/sdk/test/evm/custom.test.ts +++ b/packages/sdk/test/evm/custom.test.ts @@ -258,7 +258,7 @@ describe("Custom Contracts", async () => { it("should not detect feature if missing from ABI", async () => { const address = await sdk.deployer.deployVote({ name: "My Vote", - voting_token_address: adminWallet.address, + voting_token_address: tokenContractAddress, }); const c = await sdk.getContractFromAbi(address, VoteERC20__factory.abi); invariant(c, "Contract undefined");