Skip to content

fix(codama): use PDA defaults instead of hardcoded public keys #32

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

Draft
amilz wants to merge 4 commits into
base: main
Choose a base branch
from
+129 −152
Draft

fix(codama): use PDA defaults instead of hardcoded public keys #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e50489
fix(codama): use PDA defaults instead of hardcoded public keys
amilz Mar 25, 2026
ccfcc66
fix(codama): update remaining SetArbiter hardcoded escrow_program def…
amilz Mar 25, 2026
520001e
fix: web error (req async)
amilz Mar 25, 2026
e0edbba
chore: bump to renderers-rust v3 and update Rust client deps
amilz Mar 26, 2026
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
9 changes: 4 additions & 5 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ pinocchio-token-2022 = "^0.2.0"
spl-token-2022 = { version = "^10.0.0", features = ["no-entrypoint"] }
thiserror = "^2.0.17"
solana-security-txt = "^1.1.2"
borsh = "^1.6.0"
borsh = { version = "^1.6.0", features = ["derive"] }
num-derive = "^0.4.0"
num-traits = "^0.2.0"
4 changes: 2 additions & 2 deletions apps/web/src/components/instructions/UpdateAdmin.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { useState } from 'react';
import type { Address } from '@solana/kit';
import { Badge } from '@solana/design-system/badge';
import { getUpdateAdminInstruction } from '@solana/escrow-program-client';
import { getUpdateAdminInstructionAsync } from '@solana/escrow-program-client';
import { useSendTx } from '@/hooks/useSendTx';
import { useSavedValues } from '@/contexts/SavedValuesContext';
import { useWallet } from '@/contexts/WalletContext';
Expand Down Expand Up @@ -33,7 +33,7 @@ export function UpdateAdmin() {
return;
}

const ix = getUpdateAdminInstruction(
const ix = await getUpdateAdminInstructionAsync(
{
admin: signer,
newAdmin: signer,
Expand Down
9 changes: 4 additions & 5 deletions clients/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ repository = "https://github.com/solana-program/escrow"

[dependencies]
borsh = { workspace = true }
solana-account-info = "3.1.0"
solana-pubkey = "4.0.0"
solana-address = "2.0.0"
solana-instruction = "3.1.0"
solana-cpi = "3.0.1"
solana-account-info = "~3.1"
solana-address = { version = "~2.2", features = ["borsh", "copy", "curve25519", "decode"] }
solana-instruction = "~3.1"
solana-cpi = "~3.0"
num-derive = { workspace = true }
num-traits = { workspace = true }

Expand Down
151 changes: 82 additions & 69 deletions idl/escrow_program.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,8 +761,12 @@
},
{
"defaultValue": {
"kind": "publicKeyValueNode",
"publicKey": "Eq63FWYo9DXgwoTnpK9gjp7BH4PyhSPo11zEF9FK7f4M"
"kind": "pdaValueNode",
"pda": {
"kind": "pdaLinkNode",
"name": "eventAuthority"
},
"seeds": []
},
"docs": [
"Event authority PDA for CPI event emission"
Expand All @@ -773,13 +777,10 @@
"name": "eventAuthority"
},
{
"defaultValue": {
"kind": "publicKeyValueNode",
"publicKey": "Escrowae7RaUfNn4oEZHywMXE5zWzYCXenwrCDaEoifg"
},
"docs": [
"Escrow program for CPI event emission"
"Escrow Program ID (this program)"
],
"isOptional": true,
"isSigner": false,
"isWritable": false,
"kind": "instructionAccountNode",
Expand Down Expand Up @@ -895,8 +896,12 @@
},
{
"defaultValue": {
"kind": "publicKeyValueNode",
"publicKey": "Eq63FWYo9DXgwoTnpK9gjp7BH4PyhSPo11zEF9FK7f4M"
"kind": "pdaValueNode",
"pda": {
"kind": "pdaLinkNode",
"name": "eventAuthority"
},
"seeds": []
},
"docs": [
"Event authority PDA for CPI event emission"
Expand All @@ -907,13 +912,10 @@
"name": "eventAuthority"
},
{
"defaultValue": {
"kind": "publicKeyValueNode",
"publicKey": "Escrowae7RaUfNn4oEZHywMXE5zWzYCXenwrCDaEoifg"
},
"docs": [
"Escrow program for CPI event emission"
"Escrow Program ID (this program)"
],
"isOptional": true,
"isSigner": false,
"isWritable": false,
"kind": "instructionAccountNode",
Expand Down Expand Up @@ -1038,8 +1040,12 @@
},
{
"defaultValue": {
"kind": "publicKeyValueNode",
"publicKey": "Eq63FWYo9DXgwoTnpK9gjp7BH4PyhSPo11zEF9FK7f4M"
"kind": "pdaValueNode",
"pda": {
"kind": "pdaLinkNode",
"name": "eventAuthority"
},
"seeds": []
},
"docs": [
"Event authority PDA for CPI event emission"
Expand All @@ -1050,13 +1056,10 @@
"name": "eventAuthority"
},
{
"defaultValue": {
"kind": "publicKeyValueNode",
"publicKey": "Escrowae7RaUfNn4oEZHywMXE5zWzYCXenwrCDaEoifg"
},
"docs": [
"Escrow program for CPI event emission"
"Escrow Program ID (this program)"
],
"isOptional": true,
"isSigner": false,
"isWritable": false,
"kind": "instructionAccountNode",
Expand Down Expand Up @@ -1360,8 +1363,12 @@
},
{
"defaultValue": {
"kind": "publicKeyValueNode",
"publicKey": "Eq63FWYo9DXgwoTnpK9gjp7BH4PyhSPo11zEF9FK7f4M"
"kind": "pdaValueNode",
"pda": {
"kind": "pdaLinkNode",
"name": "eventAuthority"
},
"seeds": []
},
"docs": [
"Event authority PDA for CPI event emission"
Expand All @@ -1372,13 +1379,10 @@
"name": "eventAuthority"
},
{
"defaultValue": {
"kind": "publicKeyValueNode",
"publicKey": "Escrowae7RaUfNn4oEZHywMXE5zWzYCXenwrCDaEoifg"
},
"docs": [
"Escrow program for CPI event emission"
"Escrow Program ID (this program)"
],
"isOptional": true,
"isSigner": false,
"isWritable": false,
"kind": "instructionAccountNode",
Expand Down Expand Up @@ -1490,8 +1494,12 @@
},
{
"defaultValue": {
"kind": "publicKeyValueNode",
"publicKey": "Eq63FWYo9DXgwoTnpK9gjp7BH4PyhSPo11zEF9FK7f4M"
"kind": "pdaValueNode",
"pda": {
"kind": "pdaLinkNode",
"name": "eventAuthority"
},
"seeds": []
},
"docs": [
"Event authority PDA for CPI event emission"
Expand All @@ -1502,13 +1510,10 @@
"name": "eventAuthority"
},
{
"defaultValue": {
"kind": "publicKeyValueNode",
"publicKey": "Escrowae7RaUfNn4oEZHywMXE5zWzYCXenwrCDaEoifg"
},
"docs": [
"Escrow program for CPI event emission"
"Escrow Program ID (this program)"
],
"isOptional": true,
"isSigner": false,
"isWritable": false,
"kind": "instructionAccountNode",
Expand Down Expand Up @@ -1734,8 +1739,12 @@
},
{
"defaultValue": {
"kind": "publicKeyValueNode",
"publicKey": "Eq63FWYo9DXgwoTnpK9gjp7BH4PyhSPo11zEF9FK7f4M"
"kind": "pdaValueNode",
"pda": {
"kind": "pdaLinkNode",
"name": "eventAuthority"
},
"seeds": []
},
"docs": [
"Event authority PDA for CPI event emission"
Expand All @@ -1746,13 +1755,10 @@
"name": "eventAuthority"
},
{
"defaultValue": {
"kind": "publicKeyValueNode",
"publicKey": "Escrowae7RaUfNn4oEZHywMXE5zWzYCXenwrCDaEoifg"
},
"docs": [
"Escrow program for CPI event emission"
"Escrow Program ID (this program)"
],
"isOptional": true,
"isSigner": false,
"isWritable": false,
"kind": "instructionAccountNode",
Expand Down Expand Up @@ -1970,8 +1976,12 @@
},
{
"defaultValue": {
"kind": "publicKeyValueNode",
"publicKey": "Eq63FWYo9DXgwoTnpK9gjp7BH4PyhSPo11zEF9FK7f4M"
"kind": "pdaValueNode",
"pda": {
"kind": "pdaLinkNode",
"name": "eventAuthority"
},
"seeds": []
},
"docs": [
"Event authority PDA for CPI event emission"
Expand All @@ -1982,13 +1992,10 @@
"name": "eventAuthority"
},
{
"defaultValue": {
"kind": "publicKeyValueNode",
"publicKey": "Escrowae7RaUfNn4oEZHywMXE5zWzYCXenwrCDaEoifg"
},
"docs": [
"Escrow program for CPI event emission"
"Escrow Program ID (this program)"
],
"isOptional": true,
"isSigner": false,
"isWritable": false,
"kind": "instructionAccountNode",
Expand Down Expand Up @@ -2121,8 +2128,12 @@
},
{
"defaultValue": {
"kind": "publicKeyValueNode",
"publicKey": "Eq63FWYo9DXgwoTnpK9gjp7BH4PyhSPo11zEF9FK7f4M"
"kind": "pdaValueNode",
"pda": {
"kind": "pdaLinkNode",
"name": "eventAuthority"
},
"seeds": []
},
"docs": [
"Event authority PDA for CPI event emission"
Expand All @@ -2133,13 +2144,10 @@
"name": "eventAuthority"
},
{
"defaultValue": {
"kind": "publicKeyValueNode",
"publicKey": "Escrowae7RaUfNn4oEZHywMXE5zWzYCXenwrCDaEoifg"
},
"docs": [
"Escrow program for CPI event emission"
"Escrow Program ID (this program)"
],
"isOptional": true,
"isSigner": false,
"isWritable": false,
"kind": "instructionAccountNode",
Expand Down Expand Up @@ -2242,8 +2250,12 @@
},
{
"defaultValue": {
"kind": "publicKeyValueNode",
"publicKey": "Eq63FWYo9DXgwoTnpK9gjp7BH4PyhSPo11zEF9FK7f4M"
"kind": "pdaValueNode",
"pda": {
"kind": "pdaLinkNode",
"name": "eventAuthority"
},
"seeds": []
},
"docs": [
"Event authority PDA for CPI event emission"
Expand All @@ -2254,13 +2266,10 @@
"name": "eventAuthority"
},
{
"defaultValue": {
"kind": "publicKeyValueNode",
"publicKey": "Escrowae7RaUfNn4oEZHywMXE5zWzYCXenwrCDaEoifg"
},
"docs": [
"Escrow program for CPI event emission"
"Escrow Program ID (this program)"
],
"isOptional": true,
"isSigner": false,
"isWritable": false,
"kind": "instructionAccountNode",
Expand Down Expand Up @@ -2376,19 +2385,23 @@
},
{
"defaultValue": {
"kind": "publicKeyValueNode",
"publicKey": "Eq63FWYo9DXgwoTnpK9gjp7BH4PyhSPo11zEF9FK7f4M"
"kind": "pdaValueNode",
"pda": {
"kind": "pdaLinkNode",
"name": "eventAuthority"
},
"seeds": []
},
"isSigner": false,
"isWritable": false,
"kind": "instructionAccountNode",
"name": "eventAuthority"
},
{
"defaultValue": {
"kind": "publicKeyValueNode",
"publicKey": "Escrowae7RaUfNn4oEZHywMXE5zWzYCXenwrCDaEoifg"
},
"docs": [
"Escrow Program ID (this program)"
],
"isOptional": true,
"isSigner": false,
"isWritable": false,
"kind": "instructionAccountNode",
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"devDependencies": {
"@codama/nodes-from-anchor": "^1.3.8",
"@codama/renderers-js": "^1.7.0",
"@codama/renderers-rust": "^1.2.9",
"@codama/renderers-rust": "^3.0.0",
"@eslint/js": "^9.39.2",
"@jest/globals": "^30.2.0",
"@solana-program/system": "^0.11.0",
Expand Down
Loading
Loading