Skip to content

Use Codama instead of Kinobi #455

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 2 commits into from
Nov 4, 2024
Merged

Use Codama instead of Kinobi #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df0a13c
Use Codama instead of Kinobi
wjthieme Nov 4, 2024
b08b80e
Merge branch 'main' into wjthieme/codama
wjthieme Nov 4, 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
10 changes: 5 additions & 5 deletions ts-sdk/client/kinobi.js → rust-sdk/client/codama.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import { createFromRoot } from "kinobi";
import { renderVisitor } from "@kinobi-so/renderers-js";
import { rootNodeFromAnchor } from "@kinobi-so/nodes-from-anchor";
import { createFromRoot } from "codama";
import { renderVisitor } from "@codama/renderers-rust";
import { rootNodeFromAnchor } from "@codama/nodes-from-anchor";
import { readFileSync } from "fs";

const idl = JSON.parse(readFileSync("../../target/idl/whirlpool.json", "utf8"));
const node = rootNodeFromAnchor(idl);
const visitor = renderVisitor("./src/generated");
// IDL generated with anchor 0.29 does not have the address field so we have to add it manually
const kinobi = createFromRoot({
const codama = createFromRoot({
...node,
program: {
...node.program,
publicKey: "whirLbMiicVdio4qvUfM5KAg6Ct8VwpYzGff3uctyCc",
},
});
kinobi.accept(visitor);
codama.accept(visitor);
9 changes: 5 additions & 4 deletions rust-sdk/client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@
"version": "0.0.1",
"type": "module",
"scripts": {
"build": "node ./kinobi.js && cargo build",
"build": "node ./codama.js && cargo build",
"test": "cargo test --lib",
"format": "cargo clippy --fix --allow-dirty --allow-staged && cargo fmt",
"lint": "cargo clippy",
"clean": "cargo clean"
},
"devDependencies": {
"@kinobi-so/nodes-from-anchor": "^0.22.0",
"@kinobi-so/renderers-rust": "^0.22.0",
"@codama/nodes-from-anchor": "^1.0.0",
"@codama/renderers-rust": "^1.0.3",
"@orca-so/whirlpools-program": "*",
"@orca-so/whirlpools-rust-core": "*"
"@orca-so/whirlpools-rust-core": "*",
"codama": "^1.0.0"
}
}
10 changes: 5 additions & 5 deletions rust-sdk/client/kinobi.js → ts-sdk/client/codama.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import { createFromRoot } from "kinobi";
import { renderVisitor } from "@kinobi-so/renderers-rust";
import { rootNodeFromAnchor } from "@kinobi-so/nodes-from-anchor";
import { createFromRoot } from "codama";
import { renderVisitor } from "@codama/renderers-js";
import { rootNodeFromAnchor } from "@codama/nodes-from-anchor";
import { readFileSync } from "fs";

const idl = JSON.parse(readFileSync("../../target/idl/whirlpool.json", "utf8"));
const node = rootNodeFromAnchor(idl);
const visitor = renderVisitor("./src/generated");
// IDL generated with anchor 0.29 does not have the address field so we have to add it manually
const kinobi = createFromRoot({
const codama = createFromRoot({
...node,
program: {
...node.program,
publicKey: "whirLbMiicVdio4qvUfM5KAg6Ct8VwpYzGff3uctyCc",
},
});
kinobi.accept(visitor);
codama.accept(visitor);
8 changes: 4 additions & 4 deletions ts-sdk/client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@
"README.md"
],
"scripts": {
"build": "node ./kinobi.js && tsup src/index.ts --format cjs,esm --dts --sourcemap",
"build": "node ./codama.js && tsup src/index.ts --format cjs,esm --dts --sourcemap",
"test": "vitest run tests",
"clean": "rimraf dist src/generated"
},
"peerDependencies": {
"@solana/web3.js": "^2.0.0-rc.1"
},
"devDependencies": {
"@kinobi-so/nodes-from-anchor": "^0.22.0",
"@kinobi-so/renderers-js": "^0.22.0",
"@codama/nodes-from-anchor": "^1.0.0",
"@codama/renderers-js": "^1.0.1",
"@orca-so/whirlpools-program": "*",
"@solana/web3.js": "^2.0.0-rc.1",
"kinobi": "^0.22.0",
"codama": "^1.0.0",
"typescript": "^5.6.3"
},
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion ts-sdk/core/tests/types.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type {

// Since these tests are only for type checking, nothing actually happens at runtime.

describe("WASM exported types match Kinobi types", () => {
describe("WASM exported types match Codama types", () => {
it("Whirlpool", () => {
const fauxWhirlpool = {} as Whirlpool;
fauxWhirlpool satisfies WhirlpoolFacade;
Expand Down
Loading