fix build

solana-nft-programs · Oct 22, 2022 · cd813e4 · cd813e4
1 parent 5adb66a
commit cd813e4
Show file tree

Hide file tree

Showing 32 changed files with 815 additions and 631 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -52,7 +52,7 @@ jobs:
  uses: actions-rs/cargo@v1
  with:
  command: fmt
- args: --all --manifest-path ./program/Cargo.toml -- --check
+ args: --all --manifest-path ./Cargo.toml -- --check
 
  soteria-scan:
  runs-on: ubuntu-latest
@@ -116,8 +116,8 @@ 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/pmvYY6Wgvpe3DEj3UX1FcRpMx43sMLYLJrFTVGcqpdn/$(solana-keygen pubkey tests/test-keypairs/cardinal_payment_manager-keypair.json)/g" {}
- - 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" {}
+ - run: find . -type f -name "*" -exec sed -i'' -e "s/pmvYY6Wgvpe3DEj3UX1FcRpMx43sMLYLJrFTVGcqpdn/$(solana-keygen pubkey tests/test-keypairs/cardinal_payment_manager-keypair.json)/g" {} +
+ - run: find . -type f -name "Anchor.toml" -exec sed -i'' -e "s/yarn mocha tests\/\*.spec.ts/yarn mocha 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 --reset & echo $$! > validator.PID

diff --git a/.gitignore b/.gitignore
@@ -13,8 +13,6 @@ tests/out.xml
 
 # Ignore the build directory for Rust/Anchor
 target
-# Ignore the build directory for Rust/Anchor
-program/target
 # Anchor verified builds directory
 docker-target
 
@@ -40,7 +38,7 @@ test-ledger/
 # Generated IDL types
 artifacts/
 dist/
-src/idls/
+sdk/idl/
 keypairs
 
 site/

diff --git a/program/Cargo.lock → Cargo.lock b/program/Cargo.lock → Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -0,0 +1,11 @@
+[workspace]
+members = ["programs/*"]
+
+[profile.release]
+lto = "fat"
+codegen-units = 1
+
+[profile.release.build-override]
+opt-level = 3
+incremental = false
+codegen-units = 1
diff --git a/Makefile b/Makefile
@@ -8,19 +8,17 @@ install:
  yarn install
 
 test-keys:
- mkdir -p target/deploy
- cp -r tests/test-keypairs/* target/deploy
- LC_ALL=C find program sdk -type f -exec sed -i '' -e "s/pmvYY6Wgvpe3DEj3UX1FcRpMx43sMLYLJrFTVGcqpdn/$$(solana-keygen pubkey tests/test-keypairs/cardinal_payment_manager-keypair.json)/g" {} +
+ LC_ALL=C find programs sdk -type f -exec sed -i '' -e "s/pmvYY6Wgvpe3DEj3UX1FcRpMx43sMLYLJrFTVGcqpdn/$$(solana-keygen pubkey ./target/deploy/cardinal_payment_manager-keypair.json)/g" {} +
 
 build:
- cd program && anchor build
+ anchor build
  yarn idl:generate
 
 start:
- solana-test-validator --url https://api.mainnet-beta.solana.com \
- --clone metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s --clone PwDiXFxQsGra4sFFTT8r1QWRMd4vfumiWC1jfWNfdYT \
- --bpf-program ./program/target/deploy/cardinal_payment_manager-keypair.json ./program/target/deploy/cardinal_payment_manager.so \
- --reset --quiet & echo $$! > validator.PID
+ solana-test-validator --url https://api.devnet.solana.com \
+  --clone metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s --clone PwDiXFxQsGra4sFFTT8r1QWRMd4vfumiWC1jfWNfdYT \
+  --bpf-program ./target/deploy/cardinal_payment_manager-keypair.json ./target/deploy/cardinal_payment_manager.so \
+  --reset --quiet & echo $$! > validator.PID
  sleep 5
  solana-keygen pubkey ./tests/test-key.json
  solana airdrop 1000 $(TEST_KEY) --url http://localhost:8899
@@ -29,7 +27,7 @@ test:
  anchor test --skip-local-validator --skip-build --skip-deploy --provider.cluster localnet
 
 clean-test-keys:
- LC_ALL=C find program sdk -type f -exec sed -i '' -e "s/$$(solana-keygen pubkey tests/test-keypairs/cardinal_payment_manager-keypair.json)/pmvYY6Wgvpe3DEj3UX1FcRpMx43sMLYLJrFTVGcqpdn/g" {} +
+ LC_ALL=C find programs sdk -type f -exec sed -i '' -e "s/$$(solana-keygen pubkey ./target/deploy/cardinal_payment_manager-keypair.json)/pmvYY6Wgvpe3DEj3UX1FcRpMx43sMLYLJrFTVGcqpdn/g" {} +
 
 stop:
  pkill solana-test-validator
diff --git a/images/banner.png b/images/banner.png
diff --git a/package.json b/package.json
@@ -24,7 +24,8 @@
  "idl:generate": "./scripts/generate-idls-types.sh",
  "typecheck": "tsc",
  "lint": "eslint . --cache",
- "lint:ci": "eslint . --max-warnings=0"
+ "lint:ci": "eslint . --max-warnings=0",
+ "docs:generate": "typedoc --excludePrivate --includeVersion --out site/ sdk/index.ts"
  },
  "devDependencies": {
  "@types/bn.js": "^5.1.1",
@@ -35,6 +36,7 @@
  "jsbi": "^4.3.0",
  "mocha": "^10.1.0",
  "ts-mocha": "^10.0.0",
+ "typedoc": "^0.23.17",
  "typescript": "^4.8.4"
  },
  "peerDependencies": {
@@ -55,7 +57,7 @@
  },
  "files": [
  "dist/",
- "src/"
+ "sdk/"
  ],
  "lint-staged": {
  "*.{ts,tsx}": "eslint --cache --fix",

diff --git a/program/Cargo.toml → programs/cardinal-payment-manager/Cargo.toml b/program/Cargo.toml → programs/cardinal-payment-manager/Cargo.toml
diff --git a/program/Xargo.toml → programs/cardinal-payment-manager/Xargo.toml b/program/Xargo.toml → programs/cardinal-payment-manager/Xargo.toml
diff --git a/program/clippy.toml → ...rams/cardinal-payment-manager/clippy.toml b/program/clippy.toml → ...rams/cardinal-payment-manager/clippy.toml
diff --git a/program/src/errors.rs → ...ms/cardinal-payment-manager/src/errors.rs b/program/src/errors.rs → ...ms/cardinal-payment-manager/src/errors.rs
diff --git a/program/src/instructions/close.rs → ...payment-manager/src/instructions/close.rs b/program/src/instructions/close.rs → ...payment-manager/src/instructions/close.rs
diff --git a/program/src/instructions/handle_payment.rs → ...anager/src/instructions/handle_payment.rs b/program/src/instructions/handle_payment.rs → ...anager/src/instructions/handle_payment.rs
diff --git a/...ructions/handle_payment_with_royalties.rs → ...ructions/handle_payment_with_royalties.rs b/...ructions/handle_payment_with_royalties.rs → ...ructions/handle_payment_with_royalties.rs
diff --git a/program/src/instructions/init.rs → ...-payment-manager/src/instructions/init.rs b/program/src/instructions/init.rs → ...-payment-manager/src/instructions/init.rs
diff --git a/program/src/instructions/mod.rs → ...l-payment-manager/src/instructions/mod.rs b/program/src/instructions/mod.rs → ...l-payment-manager/src/instructions/mod.rs
diff --git a/program/src/instructions/update.rs → ...ayment-manager/src/instructions/update.rs b/program/src/instructions/update.rs → ...ayment-manager/src/instructions/update.rs
diff --git a/program/src/lib.rs → programs/cardinal-payment-manager/src/lib.rs b/program/src/lib.rs → programs/cardinal-payment-manager/src/lib.rs
diff --git a/program/src/state.rs → ...ams/cardinal-payment-manager/src/state.rs b/program/src/state.rs → ...ams/cardinal-payment-manager/src/state.rs
diff --git a/scripts/generate-idls-types.sh b/scripts/generate-idls-types.sh
@@ -5,7 +5,7 @@
 rm -rf sdk/idl/
 mkdir -p sdk/idl/
 
-for PROGRAM in $(find program/ -maxdepth 3 -name lib.rs); do
+for PROGRAM in $(find programs/ -maxdepth 3 -name lib.rs); do
  PROGRAM_NAME="cardinal_payment_manager"
  echo "Parsing IDL for $PROGRAM_NAME"
  anchor idl parse --file $PROGRAM --out-ts sdk/idl/$PROGRAM_NAME.ts || {