From 40fb9f5abbf031a89fc08609c535fab9de05f832 Mon Sep 17 00:00:00 2001
From: Mentor Palokaj <mentor@palokaj.co>
Date: Sat, 30 Oct 2021 14:33:19 +0200
Subject: [PATCH] New testnet address

---
 contracts/Rocketeer.sol       |  4 +---
 functions/modules/contract.js |  2 +-
 minter/src/modules/web3.js    |  2 +-
 truffle-config.js             | 23 +++++++++++------------
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/contracts/Rocketeer.sol b/contracts/Rocketeer.sol
index 2c3d2a9..eeb048c 100644
--- a/contracts/Rocketeer.sol
+++ b/contracts/Rocketeer.sol
@@ -23,9 +23,7 @@ contract Rocketeer is ERC721Tradable {
     {
 
         // Birth the genesis Rocketeers
-        for( uint i=0; i < 10; i++ ) {
-            spawnRocketeer( owner() );
-        }
+        spawnRocketeer( owner() );
         
     }
 
diff --git a/functions/modules/contract.js b/functions/modules/contract.js
index e249e89..c220503 100644
--- a/functions/modules/contract.js
+++ b/functions/modules/contract.js
@@ -6,7 +6,7 @@ const { infura } = functions.config()
 // Contract data
 const contractAddress = {
 	mainnet: '',
-	rinkeby: '0x2829ba9d76e675b8867E1707A9aB49B280D916c6'
+	rinkeby: '0x95d6b9549315212D3FDce9FdCa9d80978b8bB41D'
 }
 
 // ABI with only the supply definitions
diff --git a/minter/src/modules/web3.js b/minter/src/modules/web3.js
index 4ff6719..52b47cd 100644
--- a/minter/src/modules/web3.js
+++ b/minter/src/modules/web3.js
@@ -196,7 +196,7 @@ export function useChainId() {
 const contractAddressByChainId = {
 	'0x1': '',
 	// '0x4': '0x2829ba9d76e675b8867E1707A9aB49B280D916c6', // Old
-	'0x4': '0x89D9f02D2877A35E8323DC1b578FD1f6014B04d0'
+	'0x4': '0x95d6b9549315212D3FDce9FdCa9d80978b8bB41D'
 }
 
 // Contract ABI with only totalSupply, balanceOf and Transfer
diff --git a/truffle-config.js b/truffle-config.js
index 146f32c..3503599 100644
--- a/truffle-config.js
+++ b/truffle-config.js
@@ -20,12 +20,7 @@
 
 require('dotenv').config()
 
-// const HDWalletProvider = require('@truffle/hdwallet-provider');
-const LedgerWalletProvider = require('truffle-ledger-provider');
-const ledgerOptions = {
-  index: process.env.LEDGER_INDEX,
-  path: process.env.LEDGER_PATH
-}
+const HDWalletProvider = require('@truffle/hdwallet-provider');
 
 // Copied from https://github.com/ProjectOpenSea/opensea-creatures
 const MNEMONIC = process.env.MNEMONIC;
@@ -74,19 +69,23 @@ module.exports = {
     },
     rinkeby: {
       provider: function () {
-        // return new HDWalletProvider(MNEMONIC, rinkebyNodeUrl);
-        return new LedgerWalletProvider( ledgerOptions, rinkebyNodeUrl );
+        // console.log( 'Running with ', rinkebyNodeUrl )
+        return new HDWalletProvider( { privateKeys: [ process.env.ROCKETEER_PRIVKEY ], index: 0, providerOrUrl: rinkebyNodeUrl } );
       },
       network_id: 4,
+      gasPrice: 2 * 1000000000,
+      gas: 5000000,
+      networkCheckTimeout: 1000000
     },
     live: {
       network_id: 1,
       provider: function () {
-        // return new HDWalletProvider(MNEMONIC, mainnetNodeUrl);
-        return new LedgerWalletProvider( ledgerOptions, rinkebyNodeUrl );
+        // console.log( 'Running with ', mainnetNodeUrl )
+        return new HDWalletProvider( { privateKeys: [ process.env.ROCKETEER_PRIVKEY ], index: 0, providerOrUrl: mainnetNodeUrl } );
       },
-      // gas: 5000000,
-      gasPrice: 5000000000,
+      gas: 5000000,
+      gasPrice: 20 * 1000000000,
+      networkCheckTimeout: 1000000
     },
   },