Skip to content

Commit

Permalink
Programmable kind (#381)
Browse files Browse the repository at this point in the history
* Beta packages

* Start programmable

* Start issue

* First test and minor client updates

* Create fungible asset util

* Claim

* Invalidate

* Lock/unlock

* add locked transfer delegate + pass test

* bump version

* Enable all testS

* Claim receipt id

* Fix ci

---------

Co-authored-by: Giannis Chatziveroglou <gchatz@mit.edu>
  • Loading branch information
jpbogle and Giannis Chatziveroglou authored Feb 3, 2023
1 parent 42628ae commit 6df9252
Show file tree
Hide file tree
Showing 23 changed files with 1,537 additions and 179 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:
run: anchor build

- name: Run tests
run: solana-test-validator --url https://api.devnet.solana.com --clone metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s --clone PwDiXFxQsGra4sFFTT8r1QWRMd4vfumiWC1jfWNfdYT --clone pmvYY6Wgvpe3DEj3UX1FcRpMx43sMLYLJrFTVGcqpdn --clone 355AtuHH98Jy9XFg5kWodfmvSfrhcxYUKGoJe8qziFNY --clone crkdpVWjHWdggGgBuSyAqSmZUmAjYLzD435tcLDRLXr --clone 3DFgpPFW6H5vjCaUg1crHg98dGUEUd3VcLiwada4jz1D --bpf-program mgr99QFMYByTqGPWmNqunV7vBLmWWXdSrHUfV8Jf3JM ./target/deploy/cardinal_token_manager.so --bpf-program pcaBwhJ1YHp7UDA7HASpQsRUmUNwzgYaLQto2kSj1fR ./target/deploy/cardinal_paid_claim_approver.so --bpf-program tmeEDp1RgoDtZFtx6qod3HkbQmv9LMe36uqKVvsLTDE ./target/deploy/cardinal_time_invalidator.so --bpf-program useZ65tbyvWpdYCLDJaegGK34Lnsi8S3jZdwx8122qp ./target/deploy/cardinal_use_invalidator.so --bpf-program trsMRg3GzFSNgC3tdhbuKUES8YvGtUBbzp5fjxLtVQW ./target/deploy/cardinal_transfer_authority.so --reset & echo $$! > validator.PID
run: solana-test-validator --url https://api.devnet.solana.com --clone metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s --clone PwDiXFxQsGra4sFFTT8r1QWRMd4vfumiWC1jfWNfdYT --clone pmvYY6Wgvpe3DEj3UX1FcRpMx43sMLYLJrFTVGcqpdn --clone 355AtuHH98Jy9XFg5kWodfmvSfrhcxYUKGoJe8qziFNY --clone crkdpVWjHWdggGgBuSyAqSmZUmAjYLzD435tcLDRLXr --clone auth9SigNpDKz4sJJ1DfCTuZrZNSAgh9sFD3rboVmgg --clone BXPrcDXuxa4G7m5qj4hu9Fs48sAPJqsjK5Y5S8qxH44J --clone 3DFgpPFW6H5vjCaUg1crHg98dGUEUd3VcLiwada4jz1D --bpf-program mgr99QFMYByTqGPWmNqunV7vBLmWWXdSrHUfV8Jf3JM ./target/deploy/cardinal_token_manager.so --bpf-program pcaBwhJ1YHp7UDA7HASpQsRUmUNwzgYaLQto2kSj1fR ./target/deploy/cardinal_paid_claim_approver.so --bpf-program tmeEDp1RgoDtZFtx6qod3HkbQmv9LMe36uqKVvsLTDE ./target/deploy/cardinal_time_invalidator.so --bpf-program useZ65tbyvWpdYCLDJaegGK34Lnsi8S3jZdwx8122qp ./target/deploy/cardinal_use_invalidator.so --bpf-program trsMRg3GzFSNgC3tdhbuKUES8YvGtUBbzp5fjxLtVQW ./target/deploy/cardinal_transfer_authority.so --reset & echo $$! > validator.PID
- run: sleep 6
- run: yarn test

Expand Down
104 changes: 80 additions & 24 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ start:
solana-test-validator --url https://api.mainnet-beta.solana.com \
--clone metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s --clone PwDiXFxQsGra4sFFTT8r1QWRMd4vfumiWC1jfWNfdYT \
--clone pmvYY6Wgvpe3DEj3UX1FcRpMx43sMLYLJrFTVGcqpdn --clone 355AtuHH98Jy9XFg5kWodfmvSfrhcxYUKGoJe8qziFNY \
--clone crkdpVWjHWdggGgBuSyAqSmZUmAjYLzD435tcLDRLXr \
--clone auth9SigNpDKz4sJJ1DfCTuZrZNSAgh9sFD3rboVmgg --clone BXPrcDXuxa4G7m5qj4hu9Fs48sAPJqsjK5Y5S8qxH44J \
--clone 3DFgpPFW6H5vjCaUg1crHg98dGUEUd3VcLiwada4jz1D \
--bpf-program mgr99QFMYByTqGPWmNqunV7vBLmWWXdSrHUfV8Jf3JM ./target/deploy/cardinal_token_manager.so \
--bpf-program pcaBwhJ1YHp7UDA7HASpQsRUmUNwzgYaLQto2kSj1fR ./target/deploy/cardinal_paid_claim_approver.so \
Expand Down
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cardinal/token-manager",
"version": "3.1.0",
"version": "3.2.0-beta.1",
"description": "Cardinal token manager SDK",
"keywords": [
"solana",
Expand Down Expand Up @@ -43,9 +43,12 @@
"@cardinal/common": "^5.0.7",
"@cardinal/creator-standard": "^2.1.7",
"@cardinal/payment-manager": "^2.1.1",
"@metaplex-foundation/mpl-token-auth-rules": "^1.0.0",
"@msgpack/msgpack": "^2.8.0",
"@project-serum/anchor": "^0.26.0",
"@solana/spl-token": "^0.3.6",
"@solana/web3.js": "^1.34.0"
"@solana/web3.js": "^1.34.0",
"mplx-beta": "npm:@metaplex-foundation/mpl-token-metadata@2.8.0"
},
"devDependencies": {
"@metaplex-foundation/mpl-token-metadata": "^1.2.5",
Expand Down
2 changes: 1 addition & 1 deletion programs/cardinal-token-manager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ anchor-spl = "0.26.0"
solana-program = "1.10.29"
spl-associated-token-account = "1.1.2"
spl-token = { version = "3.3.0", features = ["no-entrypoint"] }
mpl-token-metadata = { version = "1.3.3", features = ["no-entrypoint"] }
mpl-token-metadata = { version = "1.8.0", features = ["no-entrypoint"] }
cardinal-creator-standard = { version = "^2.2.0", features = ["cpi"] }

[dev-dependencies]
Expand Down
2 changes: 2 additions & 0 deletions programs/cardinal-token-manager/src/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,6 @@ pub enum ErrorCode {
InvalidMigrateAuthority,
#[msg("Cannot migrate delegated token")]
CannotMigrateDelegatedToken,
#[msg("Invalid return target")]
InvalidReturnTarget,
}
Loading

0 comments on commit 6df9252

Please sign in to comment.