Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/busy-bags-sing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@cartesi/cli": patch
---

Add `TestUsdc` to the devnet address book, and `RefundOutputBuilder` and `UsdWithdrawalOutputBuilderFactory` to the common one.
5 changes: 5 additions & 0 deletions .changeset/thick-experts-notice.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@cartesi/cli": patch
---

Generate contracts from the rollups-contracts release instead of `@cartesi/devnet`.
3 changes: 1 addition & 2 deletions apps/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@
"yaml": "^2.8.2"
},
"devDependencies": {
"@cartesi/devnet": "2.0.0-alpha.14",
"@sunodo/wagmi-plugin-hardhat-deploy": "^0.4.0",
"@cartesi/wagmi-plugin": "1.0.0-alpha.4",
"@types/bun": "^1.3.6",
"@types/bytes": "^3.1.5",
"@types/fs-extra": "^11.0.4",
Expand Down
7 changes: 7 additions & 0 deletions apps/cli/src/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,14 @@ import {
erc721PortalAddress,
etherPortalAddress,
inputBoxAddress,
refundOutputBuilderAddress,
selfHostedApplicationFactoryAddress,
testFungibleTokenAddress,
testMultiTokenAddress,
testNonFungibleTokenAddress,
testUsdWithdrawalOutputBuilderAddress,
testUsdcAddress,
usdWithdrawalOutputBuilderFactoryAddress,
} from "./contracts.js";
import { cartesiMachineStoredHash } from "./exec";
import { getApplicationAddress, getForkConfig } from "./exec/rollups.js";
Expand Down Expand Up @@ -118,6 +121,7 @@ export const getAddressBook = async (options: {
TestToken: testFungibleTokenAddress,
TestNFT: testNonFungibleTokenAddress,
TestMultiToken: testMultiTokenAddress,
TestUsdc: testUsdcAddress,
TestUsdWithdrawalOutputBuilder: testUsdWithdrawalOutputBuilderAddress,
};

Expand All @@ -132,7 +136,10 @@ export const getAddressBook = async (options: {
ERC721Portal: erc721PortalAddress,
EtherPortal: etherPortalAddress,
InputBox: inputBoxAddress,
RefundOutputBuilder: refundOutputBuilderAddress,
SelfHostedApplicationFactory: selfHostedApplicationFactoryAddress,
UsdWithdrawalOutputBuilderFactory:
usdWithdrawalOutputBuilderFactoryAddress,
};

// gather all contracts, depending whether is fork or devnet
Expand Down
9 changes: 5 additions & 4 deletions apps/cli/wagmi.config.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import hardhatDeploy from "@sunodo/wagmi-plugin-hardhat-deploy";
import { rollupsContracts } from "@cartesi/wagmi-plugin";
import { defineConfig } from "@wagmi/cli";

export default defineConfig({
out: "src/contracts.ts",
plugins: [
hardhatDeploy({
directory: "node_modules/@cartesi/devnet/deployments",
}),
rollupsContracts(),
// the PRT contracts (DaveAppFactory, tournaments) land with
// cartesi/rollups-ts#162; uncomment once it is published
// rollupsPrtContracts(),
],
});
21 changes: 14 additions & 7 deletions bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading