Mainnet >> Master (#16)

* changes

* update the program ids for mainnet

---------

Co-authored-by: Nicholas Pettas <[email protected]>

admin/init_minter.js

@@ -1,3 +1,4 @@
+import { ComputeBudgetProgram } from '@solana/web3.js';
 import { AnchorProvider, setProvider, web3, Wallet, workspace } from '@coral-xyz/anchor';
 import * as fs from "node:fs";
 import path from "node:path";
@@ -36,15 +37,19 @@ async function main() {
         tokenProgram: TOKEN_PROGRAM_ID,
     };
     const metadata = {
-        name: "solXEN (eta)",
-        symbol: "solXENeta",
-        uri: "",
+        name: "solXEN",
+        symbol: "solXEN",
+        uri: "https://raw.githubusercontent.com/FairCrypto/sol-xen/master/images/solXEN.png",
         decimals: 9,
     };
+    const addPriorityFee = ComputeBudgetProgram.setComputeUnitPrice({
+        microLamports: 10000
+    });
     // Send the mint transaction (as Admin)
     const hash = await program.methods.createMint(metadata)
         .accounts(createAccounts)
         .signers([])
+        .preInstructions([addPriorityFee])
         .rpc();
     console.log('Create Mint tx hash', hash);
     const mintAccount = await getMint(provider.connection, mint);

admin/init_minter.ts

@@ -1,4 +1,4 @@
-import {PublicKey, SystemProgram} from '@solana/web3.js';
+import {ComputeBudgetProgram, PublicKey, SystemProgram} from '@solana/web3.js';
 import {AnchorProvider, setProvider, Program, web3, Wallet, workspace, utils} from '@coral-xyz/anchor';
 import * as fs from "node:fs";
 import path from "node:path";
@@ -62,15 +62,21 @@ async function main() {
     const metadata = {
         name: "solXEN",
         symbol: "solXEN",
-        uri: "",
+        uri: "https://raw.githubusercontent.com/FairCrypto/sol-xen/master/images/solXEN.png",
         decimals: 9,
     }
 
+    const addPriorityFee = ComputeBudgetProgram.setComputeUnitPrice({
+        microLamports: 10000
+    });
+
+
     // Send the mint transaction (as Admin)
 
     const hash = await program.methods.createMint(metadata)
         .accounts(createAccounts)
         .signers([])
+         .preInstructions([addPriorityFee])
         .rpc();
     console.log('Create Mint tx hash', hash)
 

app/sol-xen-client/src/main.rs

@@ -22,7 +22,7 @@ use dotenv::dotenv;
 use std::thread;
 use std::time::Duration;
 
-const MINERS: &str = "HzkjK2uP2osHaNm5MrNsMWYWFpsh4WyVBwUD6V6ezbTQ,R9NafUx9yS6HZzG5TSP61DyG6YwFMyniZAwsVPYPorK,27kyMxWVXCiYJ29zff2evkMu6naoDGkt8DSfnwWBMsLL,8GSbYKvNHx9fW7gTGQVTa8MT2euRnpniiwDC7XDPSA78";
+const MINERS: &str = "B8HwMYCk1o7EaJhooM4P43BHSk5M8zZHsTeJixqw7LMN,2Ewuie2KnTvMLwGqKWvEM1S2gUStHzDUfrANdJfu45QJ,5dxcK28nyAJdK9fSFuReRREeKnmAGVRpXPhwkZxAxFtJ,DdVCjv7fsPPm64HnepYy5MBfh2bNfkd84Rawey9rdt5S";
 
 #[derive(BorshSerialize, Debug)]
 pub struct EthAccount {

app/sol-xen-multiminer/src/main.rs

@@ -26,9 +26,9 @@ use std::time::Duration;
 use solana_sdk::clock::Slot;
 use solana_sdk::signature::Keypair;
 
-const MINERS: &str = "HzkjK2uP2osHaNm5MrNsMWYWFpsh4WyVBwUD6V6ezbTQ,R9NafUx9yS6HZzG5TSP61DyG6YwFMyniZAwsVPYPorK,27kyMxWVXCiYJ29zff2evkMu6naoDGkt8DSfnwWBMsLL,8GSbYKvNHx9fW7gTGQVTa8MT2euRnpniiwDC7XDPSA78";
+const MINERS: &str = "B8HwMYCk1o7EaJhooM4P43BHSk5M8zZHsTeJixqw7LMN,2Ewuie2KnTvMLwGqKWvEM1S2gUStHzDUfrANdJfu45QJ,5dxcK28nyAJdK9fSFuReRREeKnmAGVRpXPhwkZxAxFtJ,DdVCjv7fsPPm64HnepYy5MBfh2bNfkd84Rawey9rdt5S";
 
-const MINTER: &str = "FmwhDsuBtK3DqFXYnZRfho4Qd2Mty1t4khvNrpPveNao";
+const MINTER: &str = "7A5q3Cw4oN5w1UXfsRTJbxGDXmVhXL2PLhL1Hp7gGCmj";
 
 const MAX_MINERS: u8 = 4;
 

client/listener.js

@@ -15,7 +15,7 @@ async function main() {
     const connection = new web3.Connection(network, 'processed');
     const provider = new AnchorProvider(connection, null);
     setProvider(provider);
-    const program = workspace.SolXen;
+    const program = workspace.SolXenMiner;
     let listener;
     const onHashEvent = (event, slot) => {
         const { user, ethAccount, hashes, superhashes, points } = event;

client/miner.ts

@@ -128,8 +128,7 @@ async function main() {
         }
     }
 
-    const minersStr = process.env.MINERS
-        || '5i4ZPZujwASXGSYENhQEEijiU4EWBzobPAKzKUs87khw,HbUSxXr4FKPShRyk813rHcXYnLkTwWEnhABe9gHJbe9Y,FMjsA783PDyU7856mT1v44vh5FgrL2VAFR241NF5Zd1w,6uxwCexinySFNP6fox9Zf48yhPTfAGYBw4j8QWQrCzmW';
+    const minersStr = process.env.MINERS || 'B8HwMYCk1o7EaJhooM4P43BHSk5M8zZHsTeJixqw7LMN,2Ewuie2KnTvMLwGqKWvEM1S2gUStHzDUfrANdJfu45QJ,5dxcK28nyAJdK9fSFuReRREeKnmAGVRpXPhwkZxAxFtJ,DdVCjv7fsPPm64HnepYy5MBfh2bNfkd84Rawey9rdt5S';
 
     const miners = minersStr.split(',').map(s => new web3.PublicKey(s));
     const programId = miners[kind];
@@ -311,4 +310,4 @@ async function main() {
 }
 
 main().then(() => {})
-    .catch(err => console.error(err));
+    .catch(err => console.error(err));

client/minter.ts

@@ -85,8 +85,7 @@ async function main() {
     }
     // SETUP SOLANA ENVIRONMENT
 
-    const minersStr = process.env.MINERS
-        || '5i4ZPZujwASXGSYENhQEEijiU4EWBzobPAKzKUs87khw,HbUSxXr4FKPShRyk813rHcXYnLkTwWEnhABe9gHJbe9Y,FMjsA783PDyU7856mT1v44vh5FgrL2VAFR241NF5Zd1w,6uxwCexinySFNP6fox9Zf48yhPTfAGYBw4j8QWQrCzmW';
+    const minersStr = process.env.MINERS || 'B8HwMYCk1o7EaJhooM4P43BHSk5M8zZHsTeJixqw7LMN,2Ewuie2KnTvMLwGqKWvEM1S2gUStHzDUfrANdJfu45QJ,5dxcK28nyAJdK9fSFuReRREeKnmAGVRpXPhwkZxAxFtJ,DdVCjv7fsPPm64HnepYy5MBfh2bNfkd84Rawey9rdt5S';
 
     const miners = minersStr.split(',').map(s => new web3.PublicKey(s));
     const minerProgramId = miners[kind];
@@ -239,4 +238,4 @@ async function main() {
 }
 
 main().then(() => {})
-    .catch(err => console.error(err));
+    .catch(err => console.error(err));

client/multiminer.js

@@ -140,7 +140,7 @@ async function main() {
             process.exit(1);
         }
     }
-    const minersStr = process.env.MINERS || 'HzkjK2uP2osHaNm5MrNsMWYWFpsh4WyVBwUD6V6ezbTQ,R9NafUx9yS6HZzG5TSP61DyG6YwFMyniZAwsVPYPorK,27kyMxWVXCiYJ29zff2evkMu6naoDGkt8DSfnwWBMsLL,8GSbYKvNHx9fW7gTGQVTa8MT2euRnpniiwDC7XDPSA78';
+    const minersStr = process.env.MINERS || 'B8HwMYCk1o7EaJhooM4P43BHSk5M8zZHsTeJixqw7LMN,2Ewuie2KnTvMLwGqKWvEM1S2gUStHzDUfrANdJfu45QJ,5dxcK28nyAJdK9fSFuReRREeKnmAGVRpXPhwkZxAxFtJ,DdVCjv7fsPPm64HnepYy5MBfh2bNfkd84Rawey9rdt5S';
     const miners = minersStr.split(',').map(s => new web3.PublicKey(s));
     // SETUP SOLANA ENVIRONMENT
     const network = process.env.ANCHOR_PROVIDER_URL || 'localnet';

client/multiminer.ts

@@ -188,7 +188,7 @@ async function main() {
         }
     }
 
-    const minersStr = process.env.MINERS || 'HzkjK2uP2osHaNm5MrNsMWYWFpsh4WyVBwUD6V6ezbTQ,R9NafUx9yS6HZzG5TSP61DyG6YwFMyniZAwsVPYPorK,27kyMxWVXCiYJ29zff2evkMu6naoDGkt8DSfnwWBMsLL,8GSbYKvNHx9fW7gTGQVTa8MT2euRnpniiwDC7XDPSA78';
+    const minersStr = process.env.MINERS || 'B8HwMYCk1o7EaJhooM4P43BHSk5M8zZHsTeJixqw7LMN,2Ewuie2KnTvMLwGqKWvEM1S2gUStHzDUfrANdJfu45QJ,5dxcK28nyAJdK9fSFuReRREeKnmAGVRpXPhwkZxAxFtJ,DdVCjv7fsPPm64HnepYy5MBfh2bNfkd84Rawey9rdt5S';
 
     const miners = minersStr.split(',').map(s => new web3.PublicKey(s));
 

deploy.sh

@@ -26,7 +26,7 @@ current_slot=$(solana slot |   awk  '{print $0}')
 echo "current slot= $current_slot"
 
 # start_slot=$((current_slot+330))
-start_slot=268479759
+start_slot=268484759
 echo "start slot= $start_slot"
 
 timestamp=$(date +%s)
@@ -45,15 +45,15 @@ do
     key=$(anchor keys list | grep "sol_xen_miner" | awk -F': ' '{print $2}')
 
     echo "   key= $key"
-    sed -i 's/declare_id!("\(.*\)");/declare_id!("'$key'");/' ./programs/sol-xen-miner/src/lib.rs
+    gsed -i 's/declare_id!("\(.*\)");/declare_id!("'$key'");/' ./programs/sol-xen-miner/src/lib.rs
     # const START_SLOT: u64 = 301_816_336;
-    sed -i 's/const START_SLOT: u64 = \(.*\);/const START_SLOT: u64 = '$start_slot';/' ./programs/sol-xen-miner/src/lib.rs
+    gsed -i 's/const START_SLOT: u64 = \(.*\);/const START_SLOT: u64 = '$start_slot';/' ./programs/sol-xen-miner/src/lib.rs
 
     anchor build -p sol-xen-miner
 
     echo
     echo
-    anchor deploy -p sol-xen-miner
+    anchor deploy -p sol-xen-miner -- --with-compute-unit-price 1000000  --max-sign-attempts 1000
 
     echo
     echo "Sleeping for 5s..."
@@ -77,8 +77,8 @@ do
     fi
 
     # "address": "5i4ZPZujwASXGSYENhQEEijiU4EWBzobPAKzKUs87khw",
-    sed -i 's/"address": "\(.*\)",/"address": "'$key'",/' "./target/idl/sol_xen_miner_$kind.json"
-    sed -i 's/"address": "\(.*\)",/"address": "'$key'",/' "./target/types/sol_xen_miner_$kind.ts"
+    gsed -i 's/"address": "\(.*\)",/"address": "'$key'",/' "./target/idl/sol_xen_miner_$kind.json"
+    gsed -i 's/"address": "\(.*\)",/"address": "'$key'",/' "./target/types/sol_xen_miner_$kind.ts"
 
     echo
 done
@@ -91,7 +91,7 @@ echo
 echo "##### Minter #####"
 echo
 
-sed -i 's/comma_delimited = "\(.*\)";/comma_delimited = "'$miners'";/' ./programs/sol-xen-minter/src/lib.rs
+gsed -i 's/comma_delimited = "\(.*\)";/comma_delimited = "'$miners'";/' ./programs/sol-xen-minter/src/lib.rs
 
 rm ./target/deploy/sol_xen_minter.so
 rm ./target/deploy/sol_xen_minter-keypair.json
@@ -100,14 +100,14 @@ anchor build -p sol-xen-miner
 minter_key=$(anchor keys list | grep "sol_xen_minter" | awk -F': ' '{print $2}')
 
 echo "   minter key= $minter_key"
-sed -i 's/declare_id!("\(.*\)");/declare_id!("'$minter_key'");/' ./programs/sol-xen-minter/src/lib.rs
-sed -i 's/const START_SLOT: u64 = \(.*\);/const START_SLOT: u64 = '$start_slot';/' ./programs/sol-xen-minter/src/lib.rs
+gsed -i 's/declare_id!("\(.*\)");/declare_id!("'$minter_key'");/' ./programs/sol-xen-minter/src/lib.rs
+gsed -i 's/const START_SLOT: u64 = \(.*\);/const START_SLOT: u64 = '$start_slot';/' ./programs/sol-xen-minter/src/lib.rs
 
 anchor build -p sol-xen-minter
 
 echo
 echo
-anchor deploy -p sol-xen-minter
+anchor deploy -p sol-xen-minter -- --with-compute-unit-price 1000000 ----max-sign-attempts 1000 --use-rpc
 
 echo
 echo "Sleeping for 5s..."
@@ -143,12 +143,12 @@ echo
 echo "Modifying clients"
 echo
 # || '....';
-sed -i "s/process.env.MINERS || '\(.*\)';/process.env.MINERS || '"$miners"';/" ./client/multiminer.ts
+gsed -i "s/process.env.MINERS || '\(.*\)';/process.env.MINERS || '"$miners"';/" ./client/multiminer.ts
 
 # const MINERS: &str = "
-sed -i 's/const MINERS: \&str = "\(.*\)";/const MINERS: \&str = "'$miners'";/' ./app/sol-xen-client/src/main.rs
-sed -i 's/const MINERS: \&str = "\(.*\)";/const MINERS: \&str = "'$miners'";/' ./app/sol-xen-multiminer/src/main.rs
-sed -i 's/const MINTER: \&str = "\(.*\)";/const MINTER: \&str = "'$minter_key'";/' ./app/sol-xen-multiminer/src/main.rs
+gsed -i 's/const MINERS: \&str = "\(.*\)";/const MINERS: \&str = "'$miners'";/' ./app/sol-xen-client/src/main.rs
+gsed -i 's/const MINERS: \&str = "\(.*\)";/const MINERS: \&str = "'$miners'";/' ./app/sol-xen-multiminer/src/main.rs
+gsed -i 's/const MINTER: \&str = "\(.*\)";/const MINTER: \&str = "'$minter_key'";/' ./app/sol-xen-multiminer/src/main.rs
 
 # echo
 # echo "Doing test mines and mints"
@@ -164,9 +164,9 @@ echo "Compiling and Running NodeJS multiminer"
 tsc 1>/dev/null
 
 # runner.ts
-sed -i "s/runner.ts/runner.js/" ./client/multiminer.js
-sed -i "s/autominter.ts/autominter.js/" ./client/multiminer.js
-sed -i "s/multiminer/multiminer.js/" ./client/runner.js
+gsed -i "s/runner.ts/runner.js/" ./client/multiminer.js
+gsed -i "s/autominter.ts/autominter.js/" ./client/multiminer.js
+gsed -i "s/multiminer/multiminer.js/" ./client/runner.js
 
 # node ./client/multiminer.js mine --address 0x6B889Dcfad1a6ddf7dE3bC9417F5F51128efc964 -r 10 -f 1 -d 1 -a 10
 

programs/sol-xen-miner/src/lib.rs

@@ -4,7 +4,7 @@ use anchor_lang::{
 use sha3::{Digest, Keccak256};
 use ethaddr::Address;
 
-declare_id!("8GSbYKvNHx9fW7gTGQVTa8MT2euRnpniiwDC7XDPSA78");
+declare_id!("B8HwMYCk1o7EaJhooM4P43BHSk5M8zZHsTeJixqw7LMN");
 
 const MAX_HASHES: u8 = 72;
 const HASH_PATTERN: &str = "420";
@@ -13,7 +13,7 @@ const SUPERHASH_X: u16 = 250;
 const AMP_START: u16 = 300;
 const AMP_CYCLE_SLOTS: u64 = 100_000;
 
-const START_SLOT: u64 = 268479759;
+const START_SLOT: u64 = 268484759;
 
 // TODO: lock to a specifig admin key
 // const ADMIN_KEY: &str = "somesecretadminkey";

programs/sol-xen-minter/src/lib.rs

@@ -9,9 +9,9 @@ use anchor_spl::{
 };
 use mpl_token_metadata::{types::DataV2};
 
-declare_id!("FmwhDsuBtK3DqFXYnZRfho4Qd2Mty1t4khvNrpPveNao");
+declare_id!("7A5q3Cw4oN5w1UXfsRTJbxGDXmVhXL2PLhL1Hp7gGCmj");
 
-const START_SLOT: u64 = 268479759;
+const START_SLOT: u64 = 268484759;
 
 // TODO: lock to a specifig admin key
 // const ADMIN_KEY: &str = "somesecretadminkey";
@@ -95,7 +95,7 @@ pub mod sol_xen_minter {
 
         require!(kind < 4, SolXenError::BadParam);
 
-        let comma_delimited = "HzkjK2uP2osHaNm5MrNsMWYWFpsh4WyVBwUD6V6ezbTQ,R9NafUx9yS6HZzG5TSP61DyG6YwFMyniZAwsVPYPorK,27kyMxWVXCiYJ29zff2evkMu6naoDGkt8DSfnwWBMsLL,8GSbYKvNHx9fW7gTGQVTa8MT2euRnpniiwDC7XDPSA78";
+        let comma_delimited = "B8HwMYCk1o7EaJhooM4P43BHSk5M8zZHsTeJixqw7LMN,2Ewuie2KnTvMLwGqKWvEM1S2gUStHzDUfrANdJfu45QJ,5dxcK28nyAJdK9fSFuReRREeKnmAGVRpXPhwkZxAxFtJ,DdVCjv7fsPPm64HnepYy5MBfh2bNfkd84Rawey9rdt5S";
 
         let miners: Vec<Pubkey> = comma_delimited
             .split(',')

target/idl/sol_xen_miner_0.json

@@ -1,5 +1,5 @@
 {
-  "address": "HzkjK2uP2osHaNm5MrNsMWYWFpsh4WyVBwUD6V6ezbTQ",
+  "address": "B8HwMYCk1o7EaJhooM4P43BHSk5M8zZHsTeJixqw7LMN",
   "metadata": {
     "name": "sol_xen_miner",
     "version": "0.1.0-epsilon",
@@ -503,4 +503,4 @@
       }
     }
   ]
-}
+}

target/idl/sol_xen_miner_1.json

@@ -1,5 +1,5 @@
 {
-  "address": "R9NafUx9yS6HZzG5TSP61DyG6YwFMyniZAwsVPYPorK",
+  "address": "2Ewuie2KnTvMLwGqKWvEM1S2gUStHzDUfrANdJfu45QJ",
   "metadata": {
     "name": "sol_xen_miner",
     "version": "0.1.0-epsilon",
@@ -503,4 +503,4 @@
       }
     }
   ]
-}
+}

target/idl/sol_xen_miner_2.json

@@ -1,5 +1,5 @@
 {
-  "address": "27kyMxWVXCiYJ29zff2evkMu6naoDGkt8DSfnwWBMsLL",
+  "address": "5dxcK28nyAJdK9fSFuReRREeKnmAGVRpXPhwkZxAxFtJ",
   "metadata": {
     "name": "sol_xen_miner",
     "version": "0.1.0-epsilon",
@@ -503,4 +503,4 @@
       }
     }
   ]
-}
+}

target/idl/sol_xen_miner_3.json

@@ -1,5 +1,5 @@
 {
-  "address": "8GSbYKvNHx9fW7gTGQVTa8MT2euRnpniiwDC7XDPSA78",
+  "address": "DdVCjv7fsPPm64HnepYy5MBfh2bNfkd84Rawey9rdt5S",
   "metadata": {
     "name": "sol_xen_miner",
     "version": "0.1.0-epsilon",
@@ -503,4 +503,4 @@
       }
     }
   ]
-}
+}

target/idl/sol_xen_minter.json

@@ -1,5 +1,5 @@
 {
-  "address": "FmwhDsuBtK3DqFXYnZRfho4Qd2Mty1t4khvNrpPveNao",
+  "address": "7A5q3Cw4oN5w1UXfsRTJbxGDXmVhXL2PLhL1Hp7gGCmj",
   "metadata": {
     "name": "sol_xen_minter",
     "version": "0.1.0-epsilon",

target/types/sol_xen_miner_0.ts

@@ -5,7 +5,7 @@
  * IDL can be found at `target/idl/sol_xen_miner.json`.
  */
 export type SolXenMiner = {
-  "address": "HzkjK2uP2osHaNm5MrNsMWYWFpsh4WyVBwUD6V6ezbTQ",
+  "address": "B8HwMYCk1o7EaJhooM4P43BHSk5M8zZHsTeJixqw7LMN",
   "metadata": {
     "name": "solXenMiner",
     "version": "0.1.0-epsilon",

target/types/sol_xen_miner_1.ts

@@ -5,7 +5,7 @@
  * IDL can be found at `target/idl/sol_xen_miner.json`.
  */
 export type SolXenMiner = {
-  "address": "R9NafUx9yS6HZzG5TSP61DyG6YwFMyniZAwsVPYPorK",
+  "address": "2Ewuie2KnTvMLwGqKWvEM1S2gUStHzDUfrANdJfu45QJ",
   "metadata": {
     "name": "solXenMiner",
     "version": "0.1.0-epsilon",

target/types/sol_xen_miner_2.ts

@@ -5,7 +5,7 @@
  * IDL can be found at `target/idl/sol_xen_miner.json`.
  */
 export type SolXenMiner = {
-  "address": "27kyMxWVXCiYJ29zff2evkMu6naoDGkt8DSfnwWBMsLL",
+  "address": "5dxcK28nyAJdK9fSFuReRREeKnmAGVRpXPhwkZxAxFtJ",
   "metadata": {
     "name": "solXenMiner",
     "version": "0.1.0-epsilon",

target/types/sol_xen_miner_3.ts

@@ -5,7 +5,7 @@
  * IDL can be found at `target/idl/sol_xen_miner.json`.
  */
 export type SolXenMiner = {
-  "address": "8GSbYKvNHx9fW7gTGQVTa8MT2euRnpniiwDC7XDPSA78",
+  "address": "7wrKrtgkyMUP87D6qEXLWHXWBE1hMTR7sZYNJgv8bP4",
   "metadata": {
     "name": "solXenMiner",
     "version": "0.1.0-epsilon",

target/types/sol_xen_minter.ts

@@ -5,7 +5,7 @@
  * IDL can be found at `target/idl/sol_xen_minter.json`.
  */
 export type SolXenMinter = {
-  "address": "FmwhDsuBtK3DqFXYnZRfho4Qd2Mty1t4khvNrpPveNao",
+  "address": "7A5q3Cw4oN5w1UXfsRTJbxGDXmVhXL2PLhL1Hp7gGCmj",
   "metadata": {
     "name": "solXenMinter",
     "version": "0.1.0-epsilon",