Merge pull request #211 from metaproph3t/upgrade-programs

Upgrade programs to v0.3

Author: metaproph3t

Anchor.toml

@@ -5,10 +5,10 @@ seeds = false
 skip-lint = false
 
 [programs.localnet]
-amm = "CsN1N8qaMJUwoGFWt3xV4u246n2cuZy9AWLws78e3a1K"
+amm = "AMM5G2nxuKUwCLRYTW7qqEwuoqCtNSjtbipwEmm2g8bH"
 autocrat_migrator = "MigRDW6uxyNMDBD8fX2njCRyJC4YZk2Rx9pDUZiAESt"
-autocrat = "5scUH1qY87Awh5D8bQkbP2uv9BaXJXiMgrqRBw1K2vVv"
-conditional_vault = "F3RzPAtBQvUAAdDHD8AsPKFhDB1H38SULNKTW39dYrw8"
+autocrat = "autoQP9RmUNkzzKRXsMkWicDVZ3h29vvyMDcAYjCxxg"
+conditional_vault = "VAU1T7S5UuEHmMvXtXMVmpEoQtZ2ya7eRb7gcN47wDp"
 
 [registry]
 url = "https://api.apr.dev"

Cargo.lock

@@ -9,7 +9,7 @@ build-verifiable PROGRAM_NAME:
 	solana-verify build --library-name {{ PROGRAM_NAME }} -b ellipsislabs/solana:1.16.10
 
 deploy PROGRAM_NAME CLUSTER:
-	solana program deploy -u {{ CLUSTER }} --program-id ./target/deploy/{{ PROGRAM_NAME }}-keypair.json ./target/deploy/{{ PROGRAM_NAME }}.so --final && PROGRAM_ID=$(solana-keygen pubkey ./target/deploy/{{ PROGRAM_NAME }}-keypair.json) && anchor idl init --filepath ./target/idl/{{ PROGRAM_NAME }}.json $PROGRAM_ID --provider.cluster {{ CLUSTER }}
+	solana program deploy -u {{ CLUSTER }} --program-id ./target/deploy/{{ PROGRAM_NAME }}-keypair.json ./target/deploy/{{ PROGRAM_NAME }}.so --with-compute-unit-price 5 --max-sign-attempts 15 && PROGRAM_ID=$(solana-keygen pubkey ./target/deploy/{{ PROGRAM_NAME }}-keypair.json) && anchor idl init --filepath ./target/idl/{{ PROGRAM_NAME }}.json $PROGRAM_ID --provider.cluster {{ CLUSTER }}
 
 upgrade PROGRAM_NAME PROGRAM_ID CLUSTER:
 	anchor upgrade ./target/deploy/{{ PROGRAM_NAME }}.so -p {{ PROGRAM_ID }} --provider.cluster {{ CLUSTER }}

justfile

@@ -19,7 +19,7 @@
         "arweave": "^1.14.4",
         "solana-bankrun": "^0.3.0",
         "spl-token-bankrun": "0.2.5",
-        "@metadaoproject/futarchy-ts": "4.1.0"
+        "@metadaoproject/futarchy": "0.3.0-alpha.0"
     },
     "devDependencies": {
         "@mercurial-finance/dynamic-amm-sdk": "^0.4.19",

package.json

@@ -1,6 +1,6 @@
 [package]
 name = "amm"
-version = "1.0.0"
+version = "0.3.0"
 description = "Created with Anchor"
 edition = "2021"
 

programs/amm/Cargo.toml

@@ -6,12 +6,12 @@ use solana_security_txt::security_txt;
 #[cfg(not(feature = "no-entrypoint"))]
 security_txt! {
     name: "amm",
-    project_url: "https://themetadao.org",
+    project_url: "https://metadao.fi",
     contacts: "email:metaproph3t@protonmail.com",
     policy: "The market will decide whether we pay a bug bounty.",
     source_code: "https://github.com/metaDAOproject/futarchy",
-    source_release: "v1",
-    auditors: "None",
+    source_release: "v0.3",
+    auditors: "Neodyme",
     acknowledgements: "DCF = (CF1 / (1 + r)^1) + (CF2 / (1 + r)^2) + ... (CFn / (1 + r)^n)"
 }
 
@@ -22,7 +22,7 @@ pub mod state;
 use crate::instructions::*;
 use crate::state::*;
 
-declare_id!("CsN1N8qaMJUwoGFWt3xV4u246n2cuZy9AWLws78e3a1K");
+declare_id!("AMM5G2nxuKUwCLRYTW7qqEwuoqCtNSjtbipwEmm2g8bH");
 
 #[program]
 pub mod amm {

programs/amm/src/lib.rs

@@ -1,6 +1,6 @@
 [package]
 name = "autocrat"
-version = "1.0.0"
+version = "0.3.0"
 description = "SVM-based program for running futarchy"
 edition = "2021"
 

programs/autocrat/Cargo.toml

@@ -49,16 +49,16 @@ use std::borrow::Borrow;
 #[cfg(not(feature = "no-entrypoint"))]
 security_txt! {
     name: "autocrat",
-    project_url: "https://themetadao.org",
+    project_url: "https://metadao.fi",
     contacts: "email:metaproph3t@protonmail.com",
     policy: "The market will decide whether we pay a bug bounty.",
     source_code: "https://github.com/metaDAOproject/futarchy",
-    source_release: "v1",
-    auditors: "None",
+    source_release: "v0.3",
+    auditors: "Neodyme",
     acknowledgements: "DCF = (CF1 / (1 + r)^1) + (CF2 / (1 + r)^2) + ... (CFn / (1 + r)^n)"
 }
 
-declare_id!("5scUH1qY87Awh5D8bQkbP2uv9BaXJXiMgrqRBw1K2vVv");
+declare_id!("autoQP9RmUNkzzKRXsMkWicDVZ3h29vvyMDcAYjCxxg");
 
 pub const SLOTS_PER_10_SECS: u64 = 25;
 pub const THREE_DAYS_IN_SLOTS: u64 = 3 * 24 * 60 * 6 * SLOTS_PER_10_SECS;

programs/autocrat/src/lib.rs

@@ -1,6 +1,6 @@
 [package]
 name = "conditional_vault"
-version = "1.0.0"
+version = "0.3.0"
 description = "SVM-based program for minting conditional tokens"
 edition = "2021"
 

programs/conditional_vault/Cargo.toml

@@ -23,16 +23,16 @@ use solana_security_txt::security_txt;
 #[cfg(not(feature = "no-entrypoint"))]
 security_txt! {
     name: "conditional_vault",
-    project_url: "https://themetadao.org",
+    project_url: "https://metadao.fi",
     contacts: "email:metaproph3t@protonmail.com",
     policy: "The market will decide whether we pay a bug bounty.",
     source_code: "https://github.com/metaDAOproject/futarchy",
-    source_release: "v1",
-    auditors: "None",
+    source_release: "v0.3",
+    auditors: "Neodyme",
     acknowledgements: "DCF = (CF1 / (1 + r)^1) + (CF2 / (1 + r)^2) + ... (CFn / (1 + r)^n)"
 }
 
-declare_id!("F3RzPAtBQvUAAdDHD8AsPKFhDB1H38SULNKTW39dYrw8");
+declare_id!("VAU1T7S5UuEHmMvXtXMVmpEoQtZ2ya7eRb7gcN47wDp");
 
 #[program]
 pub mod conditional_vault {