Compare commits

..
Author SHA1 Message Date
github-actions[bot]GitHubgithub-actions[bot] <github-actions[bot]@users.noreply.github.com>
690ff925c3 Version Packages (#603)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2023-02-20 20:13:14 -08:00
Jonas DanielsandGitHub 4fe6797427 clean up remaining workflows (#605) 2023-02-19 02:12:39 +00:00
Jonas DanielsandGitHub f3408d05d8 [sdk] - fix possible crash in StaticJsonRpcBatchProvider (#604) 2023-02-19 01:47:29 +00:00
Jonas Daniels 845e818c66 CI all in one? 2023-02-18 14:55:51 -08:00
Jonas Daniels 5178256e84 try out new ci action 2023-02-18 14:40:23 -08:00
Jonas DanielsandGitHub 66cf1fb5c2 [various] - upgrade dependencies (#601) 2023-02-18 22:10:45 +00:00
Jonas Daniels df792f0b81 make merge queue work 2023-02-18 14:10:16 -08:00
Jonas Daniels ae0f967356 make platform own everything by default 2023-02-18 13:55:33 -08:00
Jonas Daniels 076718112f devrel should not own changeset markdown files 2023-02-18 13:54:00 -08:00
Jonas Daniels 7c9f86cc44 improve codeowners 2023-02-18 13:51:56 -08:00
Jonas DanielsandGitHub 9c90371426 Jd/add codeowners (#602) 2023-02-18 13:49:09 -08:00
52 changed files with 5116 additions and 6008 deletions
+29
View File
@@ -0,0 +1,29 @@
# Order is important; the last matching pattern takes the most precedence.
# Platform team owns everything by default
* @thirdweb-dev/platform
# Devrel owns all markdown files (README etc.)
*.md @thirdweb-dev/devrel
.changeset/
# Shared ownership of the react and react-core packages
packages/react/ @thirdweb-dev/product @thirdweb-dev/platform
packages/react-core/ @thirdweb-dev/product @thirdweb-dev/platform
# Shared ownership of the CLI
packages/cli/ @thirdweb-dev/product @thirdweb-dev/platform
# Chains is owned specifically by jonas for now
packages/chains/ @jnsdls
# .github folder + .changeset + turbo config is owned by joaquim and jonas for now
.github/ @jnsdls @joaquim-verges
.changeset/config.json @jnsdls @joaquim-verges
turbo.json @joaquim-verges @jnsdls
+1 -1
View File
@@ -13,6 +13,6 @@ runs:
- name: Install dependencies
shell: bash
run: yarn install --frozen-lockfile
run: yarn
env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: "1"
-34
View File
@@ -1,34 +0,0 @@
name: CI
on:
push:
branches: ["main"]
pull_request:
types: [opened, synchronize]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
build:
name: Build and Test
timeout-minutes: 30
runs-on: ubuntu-latest-16
# To use Remote Caching, uncomment the next lines and follow the steps below.
env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
steps:
- name: Check out code
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Install
uses: ./.github/composite-actions/install
# this already builds anything that changed...
- name: Build & Test
run: yarn test
+142
View File
@@ -0,0 +1,142 @@
name: Build, Lint & Test
on:
push:
branches: ["main"]
pull_request:
types: [opened, synchronize]
# trigger on merge group as well (merge queue)
merge_group:
types: [checks_requested]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
# To use Remote Caching, uncomment the next lines and follow the steps below.
env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
jobs:
build:
name: Build
runs-on: ubuntu-latest-16
steps:
- name: Check out code
uses: actions/checkout@v3
with:
fetch-depth: 25
- name: Install
uses: ./.github/composite-actions/install
- run: yarn build
# We use week in the turbo cache key to keep the cache from infinitely growing
- id: get-week
run: echo "WEEK=$(date +%U)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
timeout-minutes: 5
id: cache-build
with:
path: ./*
key: ${{ github.sha }}-${{ github.run_number }}
lint:
name: Lint Packages
runs-on: ubuntu-latest
needs: build
steps:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 16
check-latest: true
- uses: actions/cache@v3
timeout-minutes: 5
id: restore-build
with:
path: ./*
key: ${{ github.sha }}-${{ github.run_number }}
- run: yarn lint
test:
name: Unit Tests
runs-on: ubuntu-latest-16
needs: build
steps:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 16
check-latest: true
- uses: actions/cache@v3
timeout-minutes: 5
id: restore-build
with:
path: ./*
key: ${{ github.sha }}-${{ github.run_number }}
- run: yarn test
e2e:
name: E2E Tests
runs-on: ubuntu-latest-16
needs: build
steps:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 16
check-latest: true
- uses: actions/cache@v3
timeout-minutes: 5
id: restore-build
with:
path: ./*
key: ${{ github.sha }}-${{ github.run_number }}
- name: Install Playwright
run: npx playwright install --with-deps
- name: Run e2e tests
run: yarn e2e
env:
NODE_OPTIONS: "--max_old_space_size=4096"
size:
name: Size Comparison
runs-on: ubuntu-latest-8
needs: build
timeout-minutes: 30
# only run on pull requests that are targeting main
if: github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'main'
steps:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 16
check-latest: true
- uses: actions/cache@v3
timeout-minutes: 5
id: restore-build
with:
path: ./*
key: ${{ github.sha }}-${{ github.run_number }}
- uses: preactjs/compressed-size-action@v2
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
strip-hash: "\\-(\\w{8})(?:\\.esm|\\.cjs)"
minimum-change-threshold: 100
# exclude source maps, node modules and any test related files
exclude: "{**/*.map,**/node_modules/**,**/test/**}"
-29
View File
@@ -1,29 +0,0 @@
name: Integration tests
on:
push:
branches: ["main"]
pull_request:
types: [opened, synchronize]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
integration-tests:
timeout-minutes: 30
runs-on: ubuntu-latest-16
steps:
- uses: actions/checkout@v3
- name: Install
uses: ./.github/composite-actions/install
- name: Install Playwright
run: npx playwright install --with-deps
- name: Run e2e tests
run: yarn e2e
env:
NODE_OPTIONS: "--max_old_space_size=4096"
-33
View File
@@ -1,33 +0,0 @@
name: Lint
on:
push:
branches: ["main"]
pull_request:
types: [opened, synchronize]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
lint:
name: Lint
timeout-minutes: 15
runs-on: ubuntu-latest
# To use Remote Caching, uncomment the next lines and follow the steps below.
env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
steps:
- name: Check out code
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Install
uses: ./.github/composite-actions/install
- name: Lint
run: yarn lint
-20
View File
@@ -1,20 +0,0 @@
name: Compressed Size
on: [pull_request]
jobs:
build:
runs-on: ubuntu-latest-8
timeout-minutes: 30
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 1
- uses: preactjs/compressed-size-action@v2
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
strip-hash: "\\-(\\w{8})(?:\\.esm|\\.cjs)"
minimum-change-threshold: 100
# exclude source maps, node modules and any test related files
exclude: "{**/*.map,**/node_modules/**,**/test/**}"
+1 -1
View File
@@ -13,7 +13,7 @@
]
},
"scripts": {
"test": "turbo run test test:evm test:solana",
"test": "turbo run test test:evm test:solana --filter=./packages/*",
"e2e": "turbo run e2e",
"build": "turbo run build --filter=./packages/*",
"build:release": "turbo run build --force --filter=./packages/*",
+6
View File
@@ -1,5 +1,11 @@
# @thirdweb-dev/auth
## 3.0.6
### Patch Changes
- [#601](https://github.com/thirdweb-dev/js/pull/601) [`66cf1fb`](https://github.com/thirdweb-dev/js/commit/66cf1fb5c2e8deb486543ee028d786bb8eef6c19) Thanks [@jnsdls](https://github.com/jnsdls)! - upgrade dependencies
## 3.0.5
### Patch Changes
+2 -5
View File
@@ -1,6 +1,6 @@
{
"name": "@thirdweb-dev/auth",
"version": "3.0.5",
"version": "3.0.6",
"main": "dist/thirdweb-dev-auth.cjs.js",
"module": "dist/thirdweb-dev-auth.esm.js",
"exports": {
@@ -50,9 +50,6 @@
"evm/index.ts",
"solana/index.ts"
],
"___experimentalFlags_WILL_CHANGE_IN_PATCH": {
"exports": true
},
"exports": true
},
"devDependencies": {
@@ -138,4 +135,4 @@
"uuid": "^9.0.0",
"zod": "^3.20.2"
}
}
}
+6
View File
@@ -1,5 +1,11 @@
# @thirdweb-dev/chains
## 0.1.2
### Patch Changes
- [#601](https://github.com/thirdweb-dev/js/pull/601) [`66cf1fb`](https://github.com/thirdweb-dev/js/commit/66cf1fb5c2e8deb486543ee028d786bb8eef6c19) Thanks [@jnsdls](https://github.com/jnsdls)! - upgrade dependencies
## 0.1.1
### Patch Changes
-1
View File
@@ -10,7 +10,6 @@ export default {
"rpc": [
"https://songbird-canary-network.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://songbird-api.flare.network/ext/C/rpc",
"https://songbird.towolabs.com/ext/C/rpc",
"https://sgb.ftso.com.au/ext/bc/C/rpc",
"https://sgb.lightft.so/rpc",
"https://sgb-rpc.ftso.eu"
+3 -1
View File
@@ -11,7 +11,9 @@ export default {
"https://bear-network-chain-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://brnkc-test.bearnetwork.net"
],
"faucets": [],
"faucets": [
"https://faucet.bearnetwork.net"
],
"nativeCurrency": {
"name": "Bear Network Chain Testnet Token",
"symbol": "tBRNKC",
+7 -2
View File
@@ -24,8 +24,13 @@ export default {
"standard": "none"
},
{
"name": "Canto Cosmos Explorer (BigDipper)",
"url": "https://cosmos.explorer.canto.io",
"name": "Canto Cosmos Explorer",
"url": "https://cosmos-explorers.neobase.one",
"standard": "none"
},
{
"name": "Canto EVM Explorer (Blockscout)",
"url": "https://tuber.build",
"standard": "none"
}
],
+1 -4
View File
@@ -1,6 +1,6 @@
{
"name": "@thirdweb-dev/chains",
"version": "0.1.1",
"version": "0.1.2",
"main": "dist/thirdweb-dev-chains.cjs.js",
"module": "dist/thirdweb-dev-chains.esm.js",
"exports": {
@@ -24,9 +24,6 @@
"entrypoints": [
"index.ts"
],
"___experimentalFlags_WILL_CHANGE_IN_PATCH": {
"exports": true
},
"exports": true
},
"sideEffects": false,
File diff suppressed because one or more lines are too long
+7
View File
@@ -1,5 +1,12 @@
# thirdweb
## 0.9.22
### Patch Changes
- Updated dependencies [[`f3408d0`](https://github.com/thirdweb-dev/js/commit/f3408d05d84ff8418a3f76961367e47565ed32b4), [`66cf1fb`](https://github.com/thirdweb-dev/js/commit/66cf1fb5c2e8deb486543ee028d786bb8eef6c19)]:
- @thirdweb-dev/sdk@3.9.2
## 0.9.21
### Patch Changes
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "thirdweb",
"main": "dist/cli/index.js",
"version": "0.9.21",
"version": "0.9.22",
"repository": "https://github.com/thirdweb-dev/js/tree/main/packages/cli",
"author": "thirdweb eng <[email protected]>",
"license": "Apache-2.0",
+6
View File
@@ -1,5 +1,11 @@
# @thirdweb-dev/pay
## 0.1.1
### Patch Changes
- [#601](https://github.com/thirdweb-dev/js/pull/601) [`66cf1fb`](https://github.com/thirdweb-dev/js/commit/66cf1fb5c2e8deb486543ee028d786bb8eef6c19) Thanks [@jnsdls](https://github.com/jnsdls)! - upgrade dependencies
## 0.1.0
### Minor Changes
+1 -4
View File
@@ -1,6 +1,6 @@
{
"name": "@thirdweb-dev/pay",
"version": "0.1.0",
"version": "0.1.1",
"main": "dist/thirdweb-dev-pay.cjs.js",
"module": "dist/thirdweb-dev-pay.esm.js",
"exports": {
@@ -29,9 +29,6 @@
"index.ts",
"integrations/**"
],
"___experimentalFlags_WILL_CHANGE_IN_PATCH": {
"exports": true
},
"exports": true
},
"sideEffects": false,
+10
View File
@@ -1,5 +1,15 @@
# @thirdweb-dev/react-core
## 3.9.2
### Patch Changes
- [#601](https://github.com/thirdweb-dev/js/pull/601) [`66cf1fb`](https://github.com/thirdweb-dev/js/commit/66cf1fb5c2e8deb486543ee028d786bb8eef6c19) Thanks [@jnsdls](https://github.com/jnsdls)! - upgrade dependencies
- Updated dependencies [[`66cf1fb`](https://github.com/thirdweb-dev/js/commit/66cf1fb5c2e8deb486543ee028d786bb8eef6c19)]:
- @thirdweb-dev/chains@0.1.2
- @thirdweb-dev/auth@3.0.6
## 3.9.1
### Patch Changes
+2 -5
View File
@@ -1,6 +1,6 @@
{
"name": "@thirdweb-dev/react-core",
"version": "3.9.1",
"version": "3.9.2",
"repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react-core",
"author": "thirdweb eng <[email protected]>",
"license": "Apache-2.0",
@@ -33,9 +33,6 @@
"solana/index.ts",
"evm/index.ts"
],
"___experimentalFlags_WILL_CHANGE_IN_PATCH": {
"exports": true
},
"exports": true
},
"private": false,
@@ -103,4 +100,4 @@
"optional": true
}
}
}
}
+12
View File
@@ -1,5 +1,17 @@
# @thirdweb-dev/react-native
## 0.1.2
### Patch Changes
- [#601](https://github.com/thirdweb-dev/js/pull/601) [`66cf1fb`](https://github.com/thirdweb-dev/js/commit/66cf1fb5c2e8deb486543ee028d786bb8eef6c19) Thanks [@jnsdls](https://github.com/jnsdls)! - upgrade dependencies
- Updated dependencies [[`f3408d0`](https://github.com/thirdweb-dev/js/commit/f3408d05d84ff8418a3f76961367e47565ed32b4), [`66cf1fb`](https://github.com/thirdweb-dev/js/commit/66cf1fb5c2e8deb486543ee028d786bb8eef6c19)]:
- @thirdweb-dev/sdk@3.9.2
- @thirdweb-dev/react-core@3.9.2
- @thirdweb-dev/storage@1.0.10
- @thirdweb-dev/chains@0.1.2
## 0.1.1
### Patch Changes
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@thirdweb-dev/react-native",
"version": "0.1.1",
"version": "0.1.2",
"repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react-native",
"author": "thirdweb eng <[email protected]>",
"license": "Apache-2.0",
@@ -1,13 +1,10 @@
import invariant from "tiny-invariant";
import {
useAccount as useWagmiAccount,
useClient
} from "wagmi";
import { useAccount as useWagmiAccount, useClient } from "wagmi";
/**
* @internal
*/
export function useAccount() {
export function useAccount(): ReturnType<typeof useWagmiAccount> {
const wagmiContext = useClient();
invariant(
wagmiContext,
@@ -1,8 +1,5 @@
import invariant from "tiny-invariant";
import {
useNetwork as useWagmiNetwork,
useClient
} from "wagmi";
import { useNetwork as useWagmiNetwork, useClient } from "wagmi";
/**
* Hook for getting metadata about the network the current wallet is connected to and switching networks
@@ -28,7 +25,7 @@ import {
* @public
*/
export function useNetwork() {
export function useNetwork(): ReturnType<typeof useWagmiNetwork> {
const wagmiContext = useClient();
invariant(
wagmiContext,
+11
View File
@@ -1,5 +1,16 @@
# @thirdweb-dev/react
## 3.9.2
### Patch Changes
- [#601](https://github.com/thirdweb-dev/js/pull/601) [`66cf1fb`](https://github.com/thirdweb-dev/js/commit/66cf1fb5c2e8deb486543ee028d786bb8eef6c19) Thanks [@jnsdls](https://github.com/jnsdls)! - upgrade dependencies
- Updated dependencies [[`66cf1fb`](https://github.com/thirdweb-dev/js/commit/66cf1fb5c2e8deb486543ee028d786bb8eef6c19)]:
- @thirdweb-dev/react-core@3.9.2
- @thirdweb-dev/wallets@0.2.3
- @thirdweb-dev/chains@0.1.2
## 3.9.1
### Patch Changes
+1 -4
View File
@@ -1,6 +1,6 @@
{
"name": "@thirdweb-dev/react",
"version": "3.9.1",
"version": "3.9.2",
"repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react",
"author": "thirdweb eng <[email protected]>",
"license": "Apache-2.0",
@@ -42,9 +42,6 @@
"evm/index.ts",
"evm/connectors/**.ts"
],
"___experimentalFlags_WILL_CHANGE_IN_PATCH": {
"exports": true
},
"exports": true
},
"private": false,
@@ -9,13 +9,16 @@ import {
*
* @example
* ```javascript
* import { useNetwork, ChainId } from "@thirdweb-dev/react";
* import { useNetwork } from "@thirdweb-dev/react";
*
* const App = () => {
* const [, switchNetwork] = useNetwork();
*
*
* return (
* <button onClick={() => switchNetwork(ChainId.Polygon)}>
* // switchNetwork is undefined if the wallet does not support programmatic network switching
* // 137 is the chainId for Polygon in this example
* <button onClick={() => switchNetwork(137)}>
* Switch Network
* </button>
* );
+12
View File
@@ -1,5 +1,17 @@
# @thirdweb-dev/sdk
## 3.9.2
### Patch Changes
- [#604](https://github.com/thirdweb-dev/js/pull/604) [`f3408d0`](https://github.com/thirdweb-dev/js/commit/f3408d05d84ff8418a3f76961367e47565ed32b4) Thanks [@jnsdls](https://github.com/jnsdls)! - fix possible crash in StaticJsonRpcBatchProvider
- [#601](https://github.com/thirdweb-dev/js/pull/601) [`66cf1fb`](https://github.com/thirdweb-dev/js/commit/66cf1fb5c2e8deb486543ee028d786bb8eef6c19) Thanks [@jnsdls](https://github.com/jnsdls)! - upgrade dependencies
- Updated dependencies [[`66cf1fb`](https://github.com/thirdweb-dev/js/commit/66cf1fb5c2e8deb486543ee028d786bb8eef6c19)]:
- @thirdweb-dev/storage@1.0.10
- @thirdweb-dev/chains@0.1.2
## 3.9.1
### Patch Changes
+1 -4
View File
@@ -1,6 +1,6 @@
{
"name": "@thirdweb-dev/sdk",
"version": "3.9.1",
"version": "3.9.2",
"description": "The main thirdweb SDK.",
"repository": "https://github.com/thirdweb-dev/js/tree/main/packages/sdk",
"license": "Apache-2.0",
@@ -38,9 +38,6 @@
"solana/index.ts",
"solana/server/index.ts"
],
"___experimentalFlags_WILL_CHANGE_IN_PATCH": {
"exports": true
},
"exports": true
},
"sideEffects": false,
@@ -258,7 +258,6 @@ export class ShardedMerkleTree {
sort: true,
});
} catch (e) {
console.warn("No merkle entry found for address", address);
return null;
}
}
+15 -6
View File
@@ -66,13 +66,22 @@ export class StaticJsonRpcBatchProvider extends providers.StaticJsonRpcProvider
// on whether it was a success or error
batch.forEach((inflightRequest_, index) => {
const payload = result[index];
if (payload.error) {
const error = new Error(payload.error.message);
(error as any).code = payload.error.code;
(error as any).data = payload.error.data;
inflightRequest_.reject(error);
// there may *not* be a payload for a given request (typically RPC error level)
if (payload) {
// if there is a payload, check for an error
if (payload.error) {
const error = new Error(payload.error.message);
(error as any).code = payload.error.code;
(error as any).data = payload.error.data;
inflightRequest_.reject(error);
} else {
// if there's no error resolve the request
inflightRequest_.resolve(payload.result);
}
} else {
inflightRequest_.resolve(payload.result);
// if there is no payload, reject the request
inflightRequest_.reject(new Error("No response for request"));
}
});
},
-1
View File
@@ -7,7 +7,6 @@ import {
EditionDropInitializer,
EditionInitializer,
getNativeTokenByChainId,
LOCAL_NODE_PKEY,
MarketplaceInitializer,
MultiwrapInitializer,
NFTCollectionInitializer,
@@ -1,4 +1,4 @@
import { NFTMetadata, NFTMetadataInput } from "../../src/core/schema/nft";
import { NFTMetadataInput, NFTMetadataOrUri } from "../../src/core/schema/nft";
import {
ClaimEligibility,
EditionDrop,
@@ -6,12 +6,11 @@ import {
NATIVE_TOKEN_ADDRESS,
TokenInitializer,
} from "../../src/evm";
import { expectError, sdk, signers, storage } from "./before-setup";
import { expectError, sdk, signers } from "./before-setup";
import { AddressZero } from "@ethersproject/constants";
import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
import { DropERC1155_V2__factory } from "@thirdweb-dev/contracts-js";
import { assert, expect, use } from "chai";
import { BigNumber, ethers } from "ethers";
import { BigNumber } from "ethers";
import invariant from "tiny-invariant";
global.fetch = require("cross-fetch");
@@ -74,7 +73,6 @@ describe("Edition Drop Contract (V2)", async () => {
1,
);
const cost2 = await claimTx.estimateGasCostInEther();
console.log("cost2", cost2);
expect(parseFloat(cost2)).gt(0);
});
@@ -117,7 +115,7 @@ describe("Edition Drop Contract (V2)", async () => {
});
it("comprehensive test with allowlist", async () => {
const metadata = [];
const metadata: NFTMetadataOrUri[] = [];
for (let i = 0; i < 6; i++) {
metadata.push({ name: `test${i}`, description: `desc${i}` });
}
+1 -4
View File
@@ -8,10 +8,7 @@ import {
import { sdk, signers } from "./before-setup";
import { AddressZero } from "@ethersproject/constants";
import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
import {
MockContractPublisher__factory,
TWFactory__factory,
} from "@thirdweb-dev/contracts-js";
import { MockContractPublisher__factory } from "@thirdweb-dev/contracts-js";
import { expect } from "chai";
import { ethers } from "ethers";
+1 -2
View File
@@ -1,6 +1,6 @@
/* eslint-disable turbo/no-undeclared-env-vars */
import { ThirdwebSDK } from "../../src/evm";
import { assert, expect } from "chai";
import { assert } from "chai";
import { ethers, Wallet } from "ethers";
const RPC_URL = "https://rpc-mumbai.maticvigil.com/";
@@ -25,7 +25,6 @@ describe("Gasless Forwarder", async () => {
});
it.skip("should use sdk with openzeppelin defender", async () => {
const NFT_COLLECTION_ADDRESS = "0x24A5aB2878B63716B001aa9AbE816c2662192B12";
const provider = ethers.getDefaultProvider(RPC_URL);
const wallet = Wallet.createRandom().connect(provider);
const sdk = new ThirdwebSDK(wallet, {
+8 -11
View File
@@ -172,7 +172,6 @@ describe("Marketplace V3", async () => {
endTimestamp: Date = new Date(
startTimestamp.getTime() + 5 * 24 * 60 * 60 * 1000,
),
reservePricePerToken = 0.05,
): Promise<BigNumber> => {
return (
await marketplaceContract.englishAuctions.createAuction({
@@ -789,7 +788,7 @@ describe("Marketplace V3", async () => {
it("should distribute the tokens when an auction closes", async () => {
await sdk.updateSignerOrProvider(adminWallet);
const auctionId = (
const auctionId2 = (
await marketplaceContract.englishAuctions.createAuction({
assetContractAddress: dummyNftContract.getAddress(),
tokenId: "2",
@@ -806,7 +805,7 @@ describe("Marketplace V3", async () => {
await sdk.updateSignerOrProvider(bobWallet);
await marketplaceContract.englishAuctions.makeBid(auctionId, 2);
await marketplaceContract.englishAuctions.makeBid(auctionId2, 2);
await fastForwardTime(60 * 60 * 24);
@@ -820,7 +819,7 @@ describe("Marketplace V3", async () => {
"The buyer should have no tokens to start",
);
await marketplaceContract.englishAuctions.closeAuctionForBidder(
auctionId,
auctionId2,
);
const balance = await dummyNftContract.balanceOf(bobWallet.address);
@@ -844,7 +843,7 @@ describe("Marketplace V3", async () => {
);
await marketplaceContract.englishAuctions.closeAuctionForSeller(
auctionId,
auctionId2,
);
const newTokenBalance = await customTokenContract.balanceOf(
@@ -917,8 +916,6 @@ describe("Marketplace V3", async () => {
"0",
"The buyer should start with no tokens",
);
// await marketplaceContract.makeOffer(directListingId, 0.05, 1);
const offerId = await makeOffer(dummyNftContract.getAddress(), 0, 1);
await marketplaceContract.directListings.buyFromListing(
directListingId,
@@ -934,10 +931,10 @@ describe("Marketplace V3", async () => {
it("should allow offers to be made for listed tokens", async () => {
sdk.updateSignerOrProvider(bobWallet);
const bobOfferId = await makeOffer(dummyNftContract.getAddress(), 0, 1);
await makeOffer(dummyNftContract.getAddress(), 0, 1);
sdk.updateSignerOrProvider(samWallet);
const samOfferId = await makeOffer(dummyNftContract.getAddress(), 0, 1);
await makeOffer(dummyNftContract.getAddress(), 0, 1);
let offers = await marketplaceContract.offers.getAll({
start: 0,
@@ -969,11 +966,11 @@ describe("Marketplace V3", async () => {
it("should return all offers for a token when queried", async () => {
// make an offer as bob
sdk.updateSignerOrProvider(bobWallet);
const bobOfferId = await makeOffer(dummyNftContract.getAddress(), 0, 1);
await makeOffer(dummyNftContract.getAddress(), 0, 1);
// make an offer as sam
sdk.updateSignerOrProvider(samWallet);
const samOfferId = await makeOffer(dummyNftContract.getAddress(), 0, 1);
await makeOffer(dummyNftContract.getAddress(), 0, 1);
// fetch all offers for the token
sdk.updateSignerOrProvider(adminWallet);
+8 -8
View File
@@ -1,4 +1,4 @@
import { NFTMetadataInput } from "../../src/core/schema/nft";
import { NFTMetadataInput, NFTMetadataOrUri } from "../../src/core/schema/nft";
import {
ClaimEligibility,
NATIVE_TOKEN_ADDRESS,
@@ -41,9 +41,9 @@ describe("NFT Drop Contract (v3)", async () => {
platform_fee_basis_points: 10,
platform_fee_recipient: AddressZero,
},
3,
"3",
);
dropContract = await sdk.getNFTDrop(address);
dropContract = await sdk.getContract(address, "nft-drop");
});
it("should lazy mint with URI", async () => {
@@ -57,7 +57,7 @@ describe("NFT Drop Contract (v3)", async () => {
});
it("comprehensive test", async () => {
const metadata = [];
const metadata: NFTMetadataOrUri[] = [];
for (let i = 0; i < 10; i++) {
metadata.push({ name: `test${i}`, description: `desc${i}` });
}
@@ -95,7 +95,7 @@ describe("NFT Drop Contract (v3)", async () => {
});
it("comprehensive test with allowlist", async () => {
const metadata = [];
const metadata: NFTMetadataOrUri[] = [];
for (let i = 0; i < 10; i++) {
metadata.push({ name: `test${i}`, description: `desc${i}` });
}
@@ -211,12 +211,12 @@ describe("NFT Drop Contract (v3)", async () => {
let proof = await dropContract.claimConditions.getClaimerProofs(
bobWallet.address,
);
expect(proof.address).to.eq(bobWallet.address);
expect(proof?.address).to.eq(bobWallet.address);
proof = await dropContract.claimConditions.getClaimerProofs(
bobWallet.address,
0,
);
expect(proof.address).to.eq(bobWallet.address);
expect(proof?.address).to.eq(bobWallet.address);
proof = await dropContract.claimConditions.getClaimerProofs(
samWallet.address,
);
@@ -225,7 +225,7 @@ describe("NFT Drop Contract (v3)", async () => {
samWallet.address,
0,
);
expect(proof.address).to.eq(samWallet.address);
expect(proof?.address).to.eq(samWallet.address);
});
it("should return snapshot data on claim conditions", async () => {
+4 -7
View File
@@ -1,4 +1,4 @@
import { NFTMetadataInput } from "../../src/core/schema/nft";
import { NFTMetadataInput, NFTMetadataOrUri } from "../../src/core/schema/nft";
import {
ClaimEligibility,
NATIVE_TOKEN_ADDRESS,
@@ -50,7 +50,7 @@ describe("NFT Drop Contract (v4)", async () => {
});
it("comprehensive test", async () => {
const metadata = [];
const metadata: NFTMetadataOrUri[] = [];
for (let i = 0; i < 10; i++) {
metadata.push({ name: `test${i}`, description: `desc${i}` });
}
@@ -91,7 +91,7 @@ describe("NFT Drop Contract (v4)", async () => {
});
it("comprehensive test with allowlist and price override", async () => {
const metadata = [];
const metadata: NFTMetadataOrUri[] = [];
for (let i = 0; i < 10; i++) {
metadata.push({ name: `test${i}`, description: `desc${i}` });
}
@@ -106,14 +106,11 @@ describe("NFT Drop Contract (v4)", async () => {
],
},
]);
console.log(
await dropContract.claimConditions.getClaimIneligibilityReasons(1),
);
await dropContract.claim(1);
});
it("comprehensive test with allowlist", async () => {
const metadata = [];
const metadata: NFTMetadataOrUri[] = [];
for (let i = 0; i < 10; i++) {
metadata.push({ name: `test${i}`, description: `desc${i}` });
}
-6
View File
@@ -1,4 +1,3 @@
import { getMultichainRegistryAddress, ThirdwebSDK } from "../../src/evm";
import { joinABIs } from "../../src/evm/common/plugin";
import { MultichainRegistry } from "../../src/evm/core/classes/multichain-registry";
import { ContractRegistry } from "../../src/evm/core/classes/registry";
@@ -22,12 +21,7 @@ describe("Contract Registry", () => {
it("multichain registry", async () => {
sdk.updateSignerOrProvider(adminWallet);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
multichainRegistry = sdk.multiChainRegistry;
console.log(
"multichain registry address: ",
getMultichainRegistryAddress(),
);
address = await sdk.deployer.deployNFTCollection({
name: "Test1",
+3 -3
View File
@@ -5,7 +5,7 @@ import {
TokenDropInitializer,
TokenInitializer,
} from "../../src/evm";
import { expectError, sdk, signers, storage } from "./before-setup";
import { expectError, sdk, signers } from "./before-setup";
import { AddressZero } from "@ethersproject/constants";
import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
import { assert, expect } from "chai";
@@ -39,9 +39,9 @@ describe("Token Drop Contract (v2)", async () => {
platform_fee_basis_points: 10,
platform_fee_recipient: AddressZero,
},
2,
"2",
);
dropContract = await sdk.getTokenDrop(address);
dropContract = await sdk.getContract(address, "token-drop");
});
it("comprehensive test", async () => {
+1 -1
View File
@@ -42,7 +42,7 @@ describe("Token Drop Contract (v4)", async () => {
TokenDropInitializer.contractType,
),
);
dropContract = await sdk.getTokenDrop(address);
dropContract = await sdk.getContract(address, "token-drop");
});
it("should allow a snapshot to be set", async () => {
+6
View File
@@ -1,5 +1,11 @@
# @thirdweb-dev/storage
## 1.0.10
### Patch Changes
- [#601](https://github.com/thirdweb-dev/js/pull/601) [`66cf1fb`](https://github.com/thirdweb-dev/js/commit/66cf1fb5c2e8deb486543ee028d786bb8eef6c19) Thanks [@jnsdls](https://github.com/jnsdls)! - upgrade dependencies
## 1.0.9
### Patch Changes
+1 -4
View File
@@ -1,6 +1,6 @@
{
"name": "@thirdweb-dev/storage",
"version": "1.0.9",
"version": "1.0.10",
"main": "dist/thirdweb-dev-storage.cjs.js",
"module": "dist/thirdweb-dev-storage.esm.js",
"exports": {
@@ -29,9 +29,6 @@
"dist/"
],
"preconstruct": {
"___experimentalFlags_WILL_CHANGE_IN_PATCH": {
"exports": true
},
"exports": true
},
"devDependencies": {
+11
View File
@@ -1,5 +1,16 @@
# @thirdweb-dev/unity-js-bridge
## 0.2.10
### Patch Changes
- Updated dependencies [[`f3408d0`](https://github.com/thirdweb-dev/js/commit/f3408d05d84ff8418a3f76961367e47565ed32b4), [`66cf1fb`](https://github.com/thirdweb-dev/js/commit/66cf1fb5c2e8deb486543ee028d786bb8eef6c19)]:
- @thirdweb-dev/sdk@3.9.2
- @thirdweb-dev/storage@1.0.10
- @thirdweb-dev/wallets@0.2.3
- @thirdweb-dev/auth@3.0.6
- @thirdweb-dev/pay@0.1.1
## 0.2.9
### Patch Changes
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@thirdweb-dev/unity-js-bridge",
"version": "0.2.9",
"version": "0.2.10",
"main": "dist/thirdweb-unity-bridge.js",
"repository": "https://github.com/thirdweb-dev/js/tree/main/packages/unity-js-bridge",
"license": "Apache-2.0",
+6
View File
@@ -1,5 +1,11 @@
# @thirdweb-dev/wallets
## 0.2.3
### Patch Changes
- [#601](https://github.com/thirdweb-dev/js/pull/601) [`66cf1fb`](https://github.com/thirdweb-dev/js/commit/66cf1fb5c2e8deb486543ee028d786bb8eef6c19) Thanks [@jnsdls](https://github.com/jnsdls)! - upgrade dependencies
## 0.2.2
## 0.2.1
+1 -4
View File
@@ -1,6 +1,6 @@
{
"name": "@thirdweb-dev/wallets",
"version": "0.2.2",
"version": "0.2.3",
"main": "dist/thirdweb-dev-wallets.cjs.js",
"module": "dist/thirdweb-dev-wallets.esm.js",
"exports": {
@@ -134,9 +134,6 @@
"solana/index.ts",
"solana/wallets/**"
],
"___experimentalFlags_WILL_CHANGE_IN_PATCH": {
"exports": true
},
"exports": true
},
"sideEffects": false,
-2
View File
@@ -38,8 +38,6 @@ packages.forEach((pkg) => {
}
});
console.log(packageJson);
if (!process.env.CI) {
console.error(
`Not in CI, skipping writing package.json for: "${pkg.packageJson.name}"`,
+21 -6
View File
@@ -80,18 +80,33 @@
"inputs": ["src/**"],
"dependsOn": ["build"]
},
"e2e:e2e-cra-5": {
"outputs": ["build"],
"e2e-cra-5#build": {
"outputs": ["build/**"],
"inputs": ["src/**", "fixtures/**"],
"dependsOn": ["^build"]
},
"e2e-next-12#build": {
"outputs": [".next/**"],
"inputs": ["src/**", "fixtures/**"],
"dependsOn": ["^build"]
},
"e2e-vite-3#build": {
"outputs": ["dist/**"],
"inputs": ["src/**", "fixtures/**"],
"dependsOn": ["^build"]
},
"e2e-cra-5#e2e": {
"outputs": ["playwright-report/**"],
"inputs": ["src/**", "fixtures/**"],
"dependsOn": ["build"]
},
"e2e:e2e-next-12": {
"outputs": [".next"],
"e2e-next-12#e2e": {
"outputs": ["playwright-report/**"],
"inputs": ["src/**", "fixtures/**"],
"dependsOn": ["build"]
},
"e2e:e2e-vite-3": {
"outputs": ["dist"],
"e2e-vite-3#e2e": {
"outputs": ["playwright-report/**"],
"inputs": ["src/**", "fixtures/**"],
"dependsOn": ["build"]
},
+4739 -5770
View File
File diff suppressed because it is too large Load Diff