Bump packages

solana-nft-programs · Nov 27, 2022 · 174b2d3 · 174b2d3
1 parent 899e8ce
commit 174b2d3
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 71 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -116,15 +116,11 @@ jobs:
       - name: Setup
         run: mkdir -p target/deploy
       - run: cp -r tests/test-keypairs/* target/deploy
-      - run: find . -type f -name "*" -exec sed -i'' -e "s/mgr99QFMYByTqGPWmNqunV7vBLmWWXdSrHUfV8Jf3JM/$(solana-keygen pubkey tests/test-keypairs/cardinal_token_manager-keypair.json)/g" {} +
-      - run: find . -type f -name "*" -exec sed -i'' -e "s/pcaBwhJ1YHp7UDA7HASpQsRUmUNwzgYaLQto2kSj1fR/$(solana-keygen pubkey tests/test-keypairs/cardinal_paid_claim_approver-keypair.json)/g" {} +
-      - run: find . -type f -name "*" -exec sed -i'' -e "s/tmeEDp1RgoDtZFtx6qod3HkbQmv9LMe36uqKVvsLTDE/$(solana-keygen pubkey tests/test-keypairs/cardinal_time_invalidator-keypair.json)/g" {} +
-      - run: find . -type f -name "*" -exec sed -i'' -e "s/useZ65tbyvWpdYCLDJaegGK34Lnsi8S3jZdwx8122qp/$(solana-keygen pubkey tests/test-keypairs/cardinal_use_invalidator-keypair.json)/g" {} +
-      - run: find . -type f -name "*" -exec sed -i'' -e "s/trsMRg3GzFSNgC3tdhbuKUES8YvGtUBbzp5fjxLtVQW/$(solana-keygen pubkey tests/test-keypairs/cardinal_transfer_authority-keypair.json)/g" {} +
+      - run: anchor build
       - run: find . -type f -name "Anchor.toml" -exec sed -i'' -e "s/tests\/\*.spec.ts/tests\/\*.spec.ts --reporter mocha-junit-reporter --reporter-options mochaFile=.\/tests\/out.xml/g" {} +
 
       - name: Run tests
-        run: solana-test-validator --url https://api.devnet.solana.com --clone metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s --clone PwDiXFxQsGra4sFFTT8r1QWRMd4vfumiWC1jfWNfdYT --clone pmvYY6Wgvpe3DEj3UX1FcRpMx43sMLYLJrFTVGcqpdn --clone 355AtuHH98Jy9XFg5kWodfmvSfrhcxYUKGoJe8qziFNY --clone crkdpVWjHWdggGgBuSyAqSmZUmAjYLzD435tcLDRLXr --reset & echo $$! > validator.PID
+        run: solana-test-validator --url https://api.devnet.solana.com --clone metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s --clone PwDiXFxQsGra4sFFTT8r1QWRMd4vfumiWC1jfWNfdYT --clone pmvYY6Wgvpe3DEj3UX1FcRpMx43sMLYLJrFTVGcqpdn --clone 355AtuHH98Jy9XFg5kWodfmvSfrhcxYUKGoJe8qziFNY --clone crkdpVWjHWdggGgBuSyAqSmZUmAjYLzD435tcLDRLXr --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: solana airdrop 1000 $(solana-keygen pubkey tests/test-key.json) --url http://localhost:8899
       - run: anchor test --skip-local-validator --provider.cluster localnet

diff --git a/package.json b/package.json
@@ -29,7 +29,6 @@
     "prepare": "husky install"
   },
   "devDependencies": {
-    "@cardinal/creator-standard": "^1.1.14",
     "@project-serum/anchor": "^0.24.2",
     "@rushstack/eslint-patch": "^1.1.0",
     "@saberhq/anchor-contrib": "^1.12.44",
@@ -85,8 +84,9 @@
     "*.{js,json,jsx,html,css,md}": "prettier --write"
   },
   "dependencies": {
-    "@cardinal/common": "^2.0.12",
-    "@cardinal/payment-manager": "^1.7.9",
+    "@cardinal/common": "^4.0.1",
+    "@cardinal/creator-standard": "^2.1.7",
+    "@cardinal/payment-manager": "^2.1.1",
     "@metaplex-foundation/mpl-token-metadata": "^1.2.5",
     "@solana/buffer-layout": "^4.0.0",
     "@solana/buffer-layout-utils": "^0.2.0",

diff --git a/src/transaction.ts b/src/transaction.ts
@@ -1,7 +1,6 @@
 import {
   findMintManagerId as findCCSMintManagerId,
   findRulesetId,
-  Ruleset,
 } from "@cardinal/creator-standard";
 import { withRemainingAccountsForPayment } from "@cardinal/payment-manager/dist/cjs/utils";
 import { BN } from "@project-serum/anchor";
@@ -1128,8 +1127,6 @@ export const withMigrate = async (
   const mintManagerId = findCCSMintManagerId(mintId);
   const [tokenManagerId] = await findTokenManagerAddress(mintId);
   const rulesetId = findRulesetId(rulesetName);
-  const rulesetData = await Ruleset.fromAccountAddress(connection, rulesetId);
-
   transaction.add(
     migrate(connection, wallet, {
       currentMintManager: currentMintManagerId,
@@ -1139,7 +1136,7 @@ export const withMigrate = async (
       tokenManager: tokenManagerId,
       holderTokenAccount: holderTokenAccountId,
       tokenAuthority: currentMintManagerId,
-      rulesetCollector: rulesetData.collector,
+      rulesetCollector: wallet.publicKey,
       collector: collector,
       authority: authority,
       payer: wallet.publicKey,

diff --git a/yarn.lock b/yarn.lock
@@ -17,61 +17,39 @@
   dependencies:
     regenerator-runtime "^0.13.10"
 
-"@cardinal/common@^2.0.12":
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/@cardinal/common/-/common-2.0.14.tgz#bdbe2f923df048f37ce80de39216d838dc24c1e6"
-  integrity sha512-/mZPDrD41JFPl83Potv9b3HklYIKF4ZpFHZV7pFZRXAZc+QDBbjvNDdx5EVW8gFYkfHkfH8M62LbBK8ZDtbm0g==
-  dependencies:
-    "@metaplex-foundation/mpl-token-metadata" "^1.2.5"
-    "@project-serum/anchor" "^0.24.2"
-    "@saberhq/anchor-contrib" "^1.14.1"
-    "@saberhq/solana-contrib" "^1.14.1"
-    "@saberhq/token-utils" "^1.14.1"
-    "@solana/buffer-layout" "^4.0.0"
-    "@solana/spl-token" "^0.1.8"
-    "@ubeswap/token-math" "^4.4.4"
-    bignumber.js "^9.1.0"
-    bn.js "^5.2.1"
-    polished "^4.2.2"
-    tiny-invariant "^1.2.0"
-    tslib "^2.3.1"
-
-"@cardinal/common@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@cardinal/common/-/common-3.0.1.tgz#7e5c00d6493a1457f487eb7dfc09b8a8894fa7ed"
-  integrity sha512-ldJbG9WYTA+fwwu/AkiW0iqTV7Z5h0VycSStcXpikPbqRtZMDWZOz0br2QZWMJCnzec6UWWYqIOae4hEh+2ADQ==
+"@cardinal/common@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@cardinal/common/-/common-4.0.1.tgz#cf6895c47a986e7f5a75b1260eb1a663233b141a"
+  integrity sha512-We4m3pTQouHhay4RrPJJOvmV0KOGy7vuKSRaseLPvUjdEfQRZ9SN/Oy2U4v326wBcdonVc72EAYFAqYWBJgRFQ==
   dependencies:
     "@project-serum/anchor" "^0.24.2"
     "@solana/buffer-layout" "^4.0.0"
     "@solana/spl-token" "^0.3.5"
+    "@solana/web3.js" "^1.66.2"
     bignumber.js "^9.1.0"
-    bn.js "^5.2.1"
     polished "^4.2.2"
     tslib "^2.4.0"
 
-"@cardinal/creator-standard@^1.1.14":
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/@cardinal/creator-standard/-/creator-standard-1.1.14.tgz#86af333b6f616bef914934331ac50ea29c800e86"
-  integrity sha512-QHgFwPV4m403WlZif3JBq/Lh55D1BztokGQnooccZhDyq3GWAkpnfLUF37qz5fjxniDbS1bsmVKfO6sBEIBiLg==
+"@cardinal/creator-standard@^2.1.7":
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/@cardinal/creator-standard/-/creator-standard-2.1.7.tgz#11798892ba4efb3524ae9920216b8e6a09d87acb"
+  integrity sha512-bS2c4g9JfkvEt07pDJuYU/387q6tkWXUKXSVJ1uZAy/phqWeJkntH2anTKM34caNvFW1NJdKskf52CvwWxSx2Q==
   dependencies:
     "@metaplex-foundation/rustbin" "^0.3.1"
     "@metaplex-foundation/solita" "^0.12.2"
     "@project-serum/anchor" "^0.25.0"
     "@solana/spl-token" "^0.3.5"
     "@solana/web3.js" "^1.66.2"
-    eslint-plugin-simple-import-sort "^8.0.0"
-    eslint-plugin-unused-imports "^2.0.0"
 
-"@cardinal/payment-manager@^1.7.9":
-  version "1.7.9"
-  resolved "https://registry.yarnpkg.com/@cardinal/payment-manager/-/payment-manager-1.7.9.tgz#47d894ccfbce5a40d90006e243d7b31e33524a89"
-  integrity sha512-saI8EOLwDeF41uVimBIRnDmR2RtWUWatWbYR1exAOjqrQn1D6WfrUPmmz5AoVsXmsIqQQfjydyuAYwQllIA8cw==
+"@cardinal/payment-manager@^2.1.1":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@cardinal/payment-manager/-/payment-manager-2.1.1.tgz#029ac64f327925c1fbe4a7e5d6aa6b3eb42014c6"
+  integrity sha512-SkUt1y6hKaYinoTnHmfimj9iAV9EP5vbB7t/bMgBWbmWtCSzG27jzicBreE6RRzcz5FXjqnSS+oVTkFbknthTQ==
   dependencies:
-    "@cardinal/common" "^3.0.1"
+    "@cardinal/common" "^4.0.1"
     "@metaplex-foundation/mpl-token-metadata" "^1.2.5"
     "@project-serum/anchor" "^0.25.0"
     "@saberhq/anchor-contrib" "^1.14.9"
-    "@saberhq/chai-solana" "^1.14.9"
     "@saberhq/solana-contrib" "^1.14.9"
     "@solana/spl-token" "^0.1.8"
     "@solana/web3.js" "^1.66.2"
@@ -296,7 +274,7 @@
   resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz#8be36a1f66f3265389e90b5f9c9962146758f728"
   integrity sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==
 
-"@saberhq/anchor-contrib@^1.12.44", "@saberhq/anchor-contrib@^1.14.1", "@saberhq/anchor-contrib@^1.14.9":
+"@saberhq/anchor-contrib@^1.12.44", "@saberhq/anchor-contrib@^1.14.9":
   version "1.14.9"
   resolved "https://registry.yarnpkg.com/@saberhq/anchor-contrib/-/anchor-contrib-1.14.9.tgz#1474657282c1ad3e1f83f598e2740464a7e3e169"
   integrity sha512-MbjENmcttA+yLZEGmOFU9CJDRbaWrWF/Ff6xrlrma7RJmXYPZY1n5fpt8Aj//eghebxxIx3U5mK46636c5KEEg==
@@ -307,7 +285,7 @@
     lodash.mapvalues "^4.6.0"
     tslib "^2.4.0"
 
-"@saberhq/chai-solana@^1.12.44", "@saberhq/chai-solana@^1.14.9":
+"@saberhq/chai-solana@^1.12.44":
   version "1.14.9"
   resolved "https://registry.yarnpkg.com/@saberhq/chai-solana/-/chai-solana-1.14.9.tgz#a1d2a0e8ac4567d1804485544e9f5d816ed93011"
   integrity sha512-T8Djd4EmGtlppq9ebWMmpyJ1NNBt+m4xQ8moWt08pRDlpBhJocRqj1Y3/NEA6IdWSNpTrYfFJRfPPQuYRKeOlA==
@@ -356,7 +334,7 @@
   dependencies:
     tslib "^2.4.0"
 
-"@saberhq/solana-contrib@^1.12.44", "@saberhq/solana-contrib@^1.14.1", "@saberhq/solana-contrib@^1.14.9":
+"@saberhq/solana-contrib@^1.12.44", "@saberhq/solana-contrib@^1.14.9":
   version "1.14.9"
   resolved "https://registry.yarnpkg.com/@saberhq/solana-contrib/-/solana-contrib-1.14.9.tgz#ec82b69460035df995ab163f643de61c3b7bcc17"
   integrity sha512-e09v3c62cZ2I7hcS7x4q1am4wd4v0VfiIEBZxWBpvTVCKmdbdpUWUKyecI88VHbyO9exBLGq1yxJZZsz0OPyUA==
@@ -370,7 +348,7 @@
     tiny-invariant "^1.3.1"
     tslib "^2.4.0"
 
-"@saberhq/token-utils@^1.12.44", "@saberhq/token-utils@^1.14.1", "@saberhq/token-utils@^1.14.9":
+"@saberhq/token-utils@^1.12.44", "@saberhq/token-utils@^1.14.9":
   version "1.14.9"
   resolved "https://registry.yarnpkg.com/@saberhq/token-utils/-/token-utils-1.14.9.tgz#265cb24134c504b04d247b3b8b84b74b6eb8cd52"
   integrity sha512-iIcWQYFV2UBQtfQJIsnq38eW04hSgQiJDpshyT7Z69k6FZlAaNC5yvQQnCI1k4K/z7IZpu5W8Pq8XD665UG+AA==
@@ -645,17 +623,6 @@
     "@typescript-eslint/types" "5.41.0"
     eslint-visitor-keys "^3.3.0"
 
-"@ubeswap/token-math@^4.4.4":
-  version "4.4.8"
-  resolved "https://registry.yarnpkg.com/@ubeswap/token-math/-/token-math-4.4.8.tgz#7530627c6d11ecfb3a8159b66567764256352f9e"
-  integrity sha512-/j8fld29BlWUA3hfBgFPuVorzOkhvnUyORk053pPJX0m9zhoFieRIT65A2sOGgF5Cffxj/OjN1ycAatD8vv6xg==
-  dependencies:
-    big.js "^6.1.1"
-    decimal.js-light "^2.5.1"
-    tiny-invariant "^1.2.0"
-    toformat "^2.0.0"
-    tslib "^2.4.0"
-
 "@ubeswap/token-math@^5.2.1":
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/@ubeswap/token-math/-/token-math-5.2.1.tgz#66e70ba8d65b5fdb1b7459332fbdad4ddec32a64"
@@ -861,7 +828,7 @@ base64-js@^1.3.1, base64-js@^1.5.1:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-big.js@^6.1.1, big.js@^6.2.1:
+big.js@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-6.2.1.tgz#7205ce763efb17c2e41f26f121c420c6a7c2744f"
   integrity sha512-bCtHMwL9LeDIozFn+oNhhFoq+yQ3BNdnsLSASUxLciOb1vgvpHsIO1dsENiGMgbb4SkP5TrzWzRiLddn8ahVOQ==
@@ -890,7 +857,7 @@ bindings@^1.3.0:
   dependencies:
     file-uri-to-path "1.0.0"
 
-bn.js@^5.0.0, bn.js@^5.1.0, bn.js@^5.1.2, bn.js@^5.2.0, bn.js@^5.2.1:
+bn.js@^5.0.0, bn.js@^5.1.0, bn.js@^5.1.2, bn.js@^5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70"
   integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==
@@ -3080,11 +3047,6 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-toformat@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/toformat/-/toformat-2.0.0.tgz#7a043fd2dfbe9021a4e36e508835ba32056739d8"
-  integrity sha512-03SWBVop6nU8bpyZCx7SodpYznbZF5R4ljwNLBcTQzKOD9xuihRo/psX58llS1BMFhhAI08H3luot5GoXJz2pQ==
-
 toml@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee"