Skip to content

fix: resolves viem#2306 #3237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 6, 2024
Merged

fix: resolves viem#2306 #3237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e030281
fix: resolves https://github.com/wevm/viem/issues/2306
jxom Jun 6, 2024
6b404ff
add mixed case test
joaquim-verges Jun 6, 2024
8aaf2a8
fix ethers types
joaquim-verges Jun 6, 2024
3747992
dont run tests that need GH secret
joaquim-verges Jun 6, 2024
89637f6
more test skip
joaquim-verges Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/thirdweb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
"mipd": "0.0.7",
"node-libs-browser": "2.2.1",
"uqr": "0.1.2",
"viem": "2.10.9"
"viem": "2.13.7"
},
"peerDependencies": {
"@aws-sdk/client-lambda": "^3",
Expand Down Expand Up @@ -310,4 +310,4 @@
"shamir-secret-sharing": "0.0.3",
"vitest": "1.5.0"
}
}
}
8 changes: 7 additions & 1 deletion packages/thirdweb/src/adapters/ethers5.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,13 @@ function alignTxToEthers(
}
}

return { ...rest, gasLimit: gas, to, type };
return {
...rest,
gasLimit: gas,
to,
type,
accessList: tx.accessList as ethers5.utils.AccessListish | undefined,
};
}

async function alignTxFromEthers(
Expand Down
6 changes: 5 additions & 1 deletion packages/thirdweb/src/adapters/ethers6.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,11 @@ function alignTxToEthers(
break;
}
}
return { ...rest, type };
return {
...rest,
type,
accessList: tx.accessList as ethers6.AccessListish | null | undefined,
};
}

async function alignTxFromEthers(options: {
Expand Down
2 changes: 1 addition & 1 deletion packages/thirdweb/src/contract/deployment/publisher.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ vi.mock("../../../transaction/read-contract");
vi.mock("../../../storage/download");

// TODO: Add mocks to these tests instead of using live data
describe("fetchPublishedContract", () => {
describe.runIf(process.env.TW_SECRET_KEY)("fetchPublishedContract", () => {
it("fetches the latest published contract when no version is specified", async () => {
const result = await fetchPublishedContractMetadata({
publisher: "0x4a706de5CE9bfe2f9C37BA945805e396d1810824",
Expand Down
Loading