Merge pull request #4 from rarible/feature/stack-optimisation

Feature/stack optimisation
rarible · Oct 9, 2024 · 966b9c1 · 966b9c1
2 parents f0b9196 + c7cc1b7
commit 966b9c1
Show file tree

Hide file tree

Showing 24 changed files with 29 additions and 701 deletions.
diff --git a/Anchor.toml b/Anchor.toml
@@ -5,24 +5,15 @@ resolution = true
 skip-lint = false
 
 [programs.localnet]
-libreplex_creator = "78deTr7qycJ6498vSd3pNMhdCKKWxMipniitVHQcM8RM"
-libreplex_creator_controls = "G9whLiLT9nSkxwWzWvbiKKrTL6yWxvzh2UXqNht5VXqV"
-libreplex_default_renderer = "EfC2horkE4hCaCruMvoDDWxUhcCgVaufHeG3Hkj69eR8"
-libreplex_editions = "6hRLBM1rexUvd64qaBHQJUz4ufRAFbXZXM12ExWd7kYX"
-libreplex_editions_controls = "Ady6poZ59kW6rvbad3hiQpf8vun58RzHtNQ5Zvh7aJk3"
-libreplex_inscriptions = "GAc6iGWe4D8ZDT3xqJXysn3wfARrpz9eLUC1jquvd3Q1"
-libreplex_legacy_inscribers = "Leg1xVbrpq5gY6mprak3Ud4q4mBwcJi5C9ZruYjWv7n"
-libreplex_metadata = "LibrQsXf9V1DmTtJLkEghoaF1kjJcAzWiEGoJn8mz7p"
-libreplex_monoswap_deprecated = "8Ktjj9tddWm4QM1ywrxgNRyxkNHnhBCwr9Tq3iGbPDxc"
-libreplex_nft = "3oR36M1JQ9LHM1xykKTHDvhuYVM5mDAqRmq989zc1Pzi"
-libreplex_shop = "ListjawGEdhxuAErSyYwcTEGWQswFoi6FScnGG1RKSB"
+libreplex_editions = "587DoLBH2H39i5bToWBc6zRgbD2iJZtc4Kb8nYsskYTq"
+libreplex_editions_controls = "5hEa5j38yNJRM9vQA44Q6gXVj4Db8y3mWxkDtQeofKKs"
 
 [registry]
 url = "https://api.apr.dev"
 
 [provider]
 cluster = "Localnet"
-wallet = "~/.config/solana/id.json"
+wallet = "usb://ledger"
 
 [scripts]
 test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 js-tests/**/*.ts"

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/package.json b/package.json
@@ -41,13 +41,26 @@
 
     "libreplex_editions:deploy:solana-dev-net": "anchor build -p libreplex_editions && anchor deploy -p libreplex_editions --provider.cluster https://api.devnet.solana.com --provider.wallet ~/.config/solana/id.json",
     "libreplex_editions_controls:solana-dev-net": "anchor build -p libreplex_editions_controls && anchor deploy -p libreplex_editions_controls --provider.cluster https://api.devnet.solana.com --provider.wallet ~/.config/solana/id.json",
+    "transfer-program-owner:solana-dev-net": "solana program set-upgrade-authority --skip-new-upgrade-authority-signer-check 6g8ZaBxx2tng8EhVqvaad948Vht9YFJFGG5gvAejrJj9 --new-upgrade-authority 674s1Sap3KVnr8WGrY5KGQ69oTYjjgr1disKJo6GpTYw -k ~/.config/solana/id.json -u https://api.devnet.solana.com",
+    "transfer-program-owner-back:solana-dev-net": "solana program set-upgrade-authority --skip-new-upgrade-authority-signer-check 6g8ZaBxx2tng8EhVqvaad948Vht9YFJFGG5gvAejrJj9 --new-upgrade-authority QjzRL6VwKGnpco8wx3cPjtq8ZPhewy7ohq7F5mv2eeR -k usb://ledger -u https://api.devnet.solana.com",
 
-    "libreplex_editions:deploy:solana-test-net": "anchor build -p libreplex_editions && anchor deploy -p libreplex_editions --provider.cluster https://api.testnet.solana.com --provider.wallet ~/.config/solana/id.json",
-    "libreplex_editions_controls:solana-test-net": "anchor build -p libreplex_editions_controls && anchor deploy -p libreplex_editions_controls --provider.cluster https://api.testnet.solana.com --provider.wallet ~/.config/solana/id.json",
+
+    "libreplex_editions:deploy:solana-test-net": "anchor build -p libreplex_editions && anchor deploy -p libreplex_editions --provider.cluster https://api.testnet.solana.com --provider.wallet ~/.config/solana/prod-keypair.json",
+    "libreplex_editions_controls:solana-test-net": "anchor build -p libreplex_editions_controls && anchor deploy -p libreplex_editions_controls --provider.cluster https://api.testnet.solana.com --provider.wallet ~/.config/solana/prod-keypair.json",
 
-    "libreplex_editions:deploy:eclipse-testnet": "anchor build -p libreplex_editions && anchor deploy -p libreplex_editions --provider.cluster https://testnet.dev2.eclipsenetwork.xyz --provider.wallet ~/.config/solana/id.json",
-    "libreplex_editions_controls:deploy:eclipse-testnet": "anchor build -p libreplex_editions_controls && anchor deploy -p libreplex_editions_controls --provider.cluster https://testnet.dev2.eclipsenetwork.xyz --provider.wallet ~/.config/solana/id.json",
-    "lint": "next lint"
+    "libreplex_editions:deploy:eclipse-testnet": "anchor build -p libreplex_editions && anchor deploy -p libreplex_editions --provider.cluster https://testnet.dev2.eclipsenetwork.xyz --provider.wallet ~/.config/solana/prod-keypair.json",
+    "libreplex_editions_controls:deploy:eclipse-testnet": "anchor build -p libreplex_editions_controls && anchor deploy -p libreplex_editions_controls --provider.cluster https://testnet.dev2.eclipsenetwork.xyz --provider.wallet ~/.config/solana/prod-keypair.json",
+    "lint": "next lint",
+
+    "libreplex_editions:deploy:ledger:solana-dev-net": "anchor build -p libreplex_editions && anchor deploy -p libreplex_editions --provider.cluster https://api.devnet.solana.com --provider.wallet usb://ledger",
+    "libreplex_editions_controls:deploy:ledger:solana-dev-net": "anchor build -p libreplex_editions_controls && anchor deploy -p libreplex_editions_controls --provider.cluster https://api.devnet.solana.com --provider.wallet usb://ledger",
+
+    "libreplex_editions:deploy:hot:eclispe-mainnet": "anchor build -p libreplex_editions && anchor deploy -p libreplex_editions --provider.cluster https://mainnetbeta-rpc.eclipse.xyz --provider.wallet ~/.config/solana/prod-keypair.json",
+    "libreplex_editions:deploy:hot:cli:eclispe-mainnet": "solana program deploy target/deploy/libreplex_editions.so --program-id target/deploy/libreplex_editions-keypair.json --url https://mainnetbeta-rpc.eclipse.xyz",
+
+    "libreplex_editions_controls:deploy:hot:eclispe-mainnet": "anchor build -p libreplex_editions_controls && anchor deploy -p libreplex_editions_controls --provider.cluster https://mainnetbeta-rpc.eclipse.xyz --provider.wallet ~/.config/solana/prod-keypair.json",
+    "transfer-program-owner:eclipse-main-net": "solana program set-upgrade-authority --skip-new-upgrade-authority-signer-check 5hEa5j38yNJRM9vQA44Q6gXVj4Db8y3mWxkDtQeofKKs --new-upgrade-authority 674s1Sap3KVnr8WGrY5KGQ69oTYjjgr1disKJo6GpTYw -k ~/.config/solana/prod-keypair.json -u https://mainnetbeta-rpc.eclipse.xyz",
+    "libreplex_editions_controls:deploy:hot:cli:eclispe-mainnet": "solana program deploy target/deploy/libreplex_editions_controls.so --program-id target/deploy/libreplex_editions_controls-keypair.json --url https://mainnetbeta-rpc.eclipse.xyz"
   },
   "dependencies": {
     "@coral-xyz/anchor": "0.30.0",

diff --git a/programs/libreplex_default_renderer/Cargo.toml b/programs/libreplex_default_renderer/Cargo.toml
diff --git a/programs/libreplex_default_renderer/Xargo.toml b/programs/libreplex_default_renderer/Xargo.toml
diff --git a/programs/libreplex_default_renderer/c.bmp b/programs/libreplex_default_renderer/c.bmp
diff --git a/programs/libreplex_default_renderer/src/instructions/canonical.rs b/programs/libreplex_default_renderer/src/instructions/canonical.rs
diff --git a/programs/libreplex_default_renderer/src/instructions/input.rs b/programs/libreplex_default_renderer/src/instructions/input.rs
diff --git a/programs/libreplex_default_renderer/src/instructions/mod.rs b/programs/libreplex_default_renderer/src/instructions/mod.rs
diff --git a/programs/libreplex_default_renderer/src/lib.rs b/programs/libreplex_default_renderer/src/lib.rs
diff --git a/programs/libreplex_editions/src/lib.rs b/programs/libreplex_editions/src/lib.rs
@@ -2,7 +2,7 @@ use anchor_lang::prelude::*;
 
 pub mod instructions;
 pub use instructions::*;
-declare_id!("6hRLBM1rexUvd64qaBHQJUz4ufRAFbXZXM12ExWd7kYX");
+declare_id!("587DoLBH2H39i5bToWBc6zRgbD2iJZtc4Kb8nYsskYTq");
 
 pub mod errors;
 pub mod state;

diff --git a/programs/libreplex_editions_controls/src/lib.rs b/programs/libreplex_editions_controls/src/lib.rs
@@ -5,7 +5,7 @@ pub use logic::*;
 
 pub mod instructions;
 pub use instructions::*;
-declare_id!("Ady6poZ59kW6rvbad3hiQpf8vun58RzHtNQ5Zvh7aJk3");
+declare_id!("5hEa5j38yNJRM9vQA44Q6gXVj4Db8y3mWxkDtQeofKKs");
 
 pub mod errors;
 pub mod state;

diff --git a/programs/libreplex_editions_controls/src/state.rs b/programs/libreplex_editions_controls/src/state.rs
@@ -45,7 +45,7 @@ impl Phase {
 }
 
 pub const DEFAULT_PLATFORM_FEE_PRIMARY_ADMIN: &str = "674s1Sap3KVnr8WGrY5KGQ69oTYjjgr1disKJo6GpTYw";
-pub const DEFAULT_PLATFORM_FEE_SECONDARY_ADMIN: &str = "QjzRL6VwKGnpco8wx3cPjtq8ZPhewy7ohq7F5mv2eeR";
+pub const DEFAULT_PLATFORM_FEE_SECONDARY_ADMIN: &str = "9qGioKcyuh1mwXS8MbmMgdtQuBcVS6MBRtvQUas5rMGz";
 
 #[account]
 pub struct MinterStats {

diff --git a/programs/libreplex_monoswap_deprecated/Cargo.toml b/programs/libreplex_monoswap_deprecated/Cargo.toml
diff --git a/programs/libreplex_monoswap_deprecated/Xargo.toml b/programs/libreplex_monoswap_deprecated/Xargo.toml
diff --git a/programs/libreplex_monoswap_deprecated/src/constants.rs b/programs/libreplex_monoswap_deprecated/src/constants.rs