adding ability to config inner node

Author: Madisonw

lib/allora/allora.ts

@@ -49,10 +49,11 @@ new AlloraStack(app, 'allora-single-node', {
   alloraWorkerName: process.env.ALLORA_WORKER_NAME || 'aws',
   alloraEnv: process.env.ALLORA_ENV || 'dev',
   modelRepo: process.env.MODEL_REPO || 'https://github.com/allora-network/basic-coin-prediction-node',
+  modelEnvVars: process.env.MODEL_ENV_VARS || '',
 
   //Wallet config
-  alloraWalletAddressKeyName: process.env.ALLORA_ACCOUNT_NAME || 'secret',
-  alloraWalletAddressRestoreMnemonic: process.env.ALLORA_ACCOUNT_MNEMONIC || 'secret',
+  alloraWalletAddressKeyName: process.env.ALLORA_WALLET_ADDRESS_KEY_NAME || 'secret',
+  alloraWalletAddressRestoreMnemonic: process.env.ALLORA_WALLET_ADDRESS_RESTORE_MNEMONIC || 'secret',
   alloraWalletHomeDir: process.env.ALLORA_WALLET_HOME_DIR || '',
   alloraWalletGas: process.env.ALLORA_WALLET_GAS || '1000000',
   alloraWalletGasAdjustment: process.env.ALLORA_WALLET_GAS_ADJUSTMENT || '1.0',

lib/allora/lib/allora-stack.ts

@@ -28,6 +28,7 @@ export interface AlloraStackProps extends cdk.StackProps {
   alloraWorkerName: string;
   alloraEnv: string;
   modelRepo: string;
+  modelEnvVars: string;
 
   alloraWalletAddressKeyName: string;
   alloraWalletAddressRestoreMnemonic: string;
@@ -66,6 +67,7 @@ export class AlloraStack extends cdk.Stack {
       alloraWorkerName, 
       alloraEnv,
       modelRepo,
+      modelEnvVars,
 
       //wallet props
       alloraWalletAddressKeyName,
@@ -167,6 +169,8 @@ export class AlloraStack extends cdk.Stack {
 
     const instance = singleNode.instance;
 
+    const keyPair = new ec2.KeyPair(this, `${resourceNamePrefix}KeyPair`)
+
     // Read user data script and inject variables
     const userData = fs.readFileSync(path.join(__dirname, 'assets', 'user-data', 'node.sh')).toString();
     const modifiedUserData = cdk.Fn.sub(userData, {
@@ -178,13 +182,14 @@ export class AlloraStack extends cdk.Stack {
       _ALLORA_WORKER_NAME_: alloraWorkerName,
       _ALLORA_ENV_: alloraEnv,
       _MODEL_REPO_: modelRepo,
+      _MODEL_ENV_VARS_: modelEnvVars,
 
       //wallet config
       _ALLORA_WALLET_ADDRESS_KEY_NAME_ : alloraWalletAddressKeyName,
       _ALLORA_WALLET_ADDRESS_RESTORE_MNEMONIC_ : alloraWalletAddressRestoreMnemonic, 
       _ALLORA_WALLET_HOME_DIR_: alloraWalletHomeDir,
-      _ALLORA_WALLET_GAS_: alloraWalletGas,
       _ALLORA_WALLET_GAS_ADJUSTMENT_: alloraWalletGasAdjustment,
+      _ALLORA_WALLET_GAS_: alloraWalletGas,
       _ALLORA_WALLET_NODE_RPC_: alloraWalletNodeRpc,
       _ALLORA_WALLET_MAX_RETRIES_: alloraWalletMaxRetries,
       _ALLORA_WALLET_DELAY_: alloraWalletDelay,

lib/allora/lib/assets/user-data/node.sh

@@ -12,13 +12,14 @@ echo "STACK_ID=${_STACK_ID_}" >> /etc/environment
 echo "ALLORA_WORKER_NAME=${_ALLORA_WORKER_NAME_}" >> /etc/environment
 echo "ALLORA_ENV=${_ALLORA_ENV_}" >> /etc/environment
 echo "MODEL_REPO=${_MODEL_REPO_}" >> /etc/environment
+echo -e "MODEL_ENV_VARS='${_MODEL_ENV_VARS_}'" >> /etc/environment
 
 
 echo "ALLORA_WALLET_ADDRESS_KEY_NAME=${_ALLORA_WALLET_ADDRESS_KEY_NAME_}" >> /etc/environment
 echo "ALLORA_WALLET_ADDRESS_RESTORE_MNEMONIC=${_ALLORA_WALLET_ADDRESS_RESTORE_MNEMONIC_}" >> /etc/environment
 echo "ALLORA_WALLET_HOME_DIR=${_ALLORA_WALLET_HOME_DIR_}" >> /etc/environment
-echo "ALLORA_WALLET_GAS=${_ALLORA_WALLET_GAS_}" >> /etc/environment
 echo "ALLORA_WALLET_GAS_ADJUSTMENT=${_ALLORA_WALLET_GAS_ADJUSTMENT_}" >> /etc/environment
+echo "ALLORA_WALLET_GAS=${_ALLORA_WALLET_GAS_}" >> /etc/environment
 echo "ALLORA_WALLET_NODE_RPC=${_ALLORA_WALLET_NODE_RPC_}" >> /etc/environment
 echo "ALLORA_WALLET_MAX_RETRIES=${_ALLORA_WALLET_MAX_RETRIES_}" >> /etc/environment
 echo "ALLORA_WALLET_DELAY=${_ALLORA_WALLET_DELAY_}" >> /etc/environment
@@ -92,24 +93,24 @@ cd
 sed -i "s/_ALLORA_WALLET_ADDRESS_KEY_NAME_/$ALLORA_WALLET_ADDRESS_KEY_NAME/" config.json
 sed -i "s/_ALLORA_WALLET_ADDRESS_RESTORE_MNEMONIC_/$ALLORA_WALLET_ADDRESS_RESTORE_MNEMONIC/" config.json
 sed -i "s/_ALLORA_WALLET_HOME_DIR_/$ALLORA_WALLET_HOME_DIR/" config.json
+sed -i "s/_ALLORA_WALLET_GAS_ADJUSTMENT_/$ALLORA_WALLET_GAS_ADJUSTMENT/" config.json #must go before
 sed -i "s/_ALLORA_WALLET_GAS_/$ALLORA_WALLET_GAS/" config.json
-sed -i "s/_ALLORA_WALLET_GAS_ADJUSTMENT_/$ALLORA_WALLET_GAS_ADJUSTMENT/" config.json
-sed -i "s/_ALLORA_WALLET_NODE_RPC_/$ALLORA_WALLET_NODE_RPC/" config.json
+sed -i "s#_ALLORA_WALLET_NODE_RPC_#$ALLORA_WALLET_NODE_RPC#" config.json
 sed -i "s/_ALLORA_WALLET_MAX_RETRIES_/$ALLORA_WALLET_MAX_RETRIES/" config.json
 sed -i "s/_ALLORA_WALLET_DELAY_/$ALLORA_WALLET_DELAY/" config.json
 sed -i "s/_ALLORA_WALLET_SUBMIT_TX_/$ALLORA_WALLET_SUBMIT_TX/" config.json
 
 #worker config str replace
 sed -i "s/_ALLORA_WORKER_TOPIC_ID_/$ALLORA_WORKER_TOPIC_ID/" config.json
 sed -i "s/_ALLORA_WORKER_INFERENCE_ENTRYPOINT_NAME_/$ALLORA_WORKER_INFERENCE_ENTRYPOINT_NAME/" config.json
-sed -i "s/_ALLORA_WORKER_INFERENCE_ENDPOINT_/$ALLORA_WORKER_INFERENCE_ENDPOINT/" config.json
+sed -i "s#_ALLORA_WORKER_INFERENCE_ENDPOINT_#$ALLORA_WORKER_INFERENCE_ENDPOINT#" config.json
 sed -i "s/_ALLORA_WORKER_LOOP_SECONDS_/$ALLORA_WORKER_LOOP_SECONDS/" config.json
 sed -i "s/_ALLORA_WORKER_TOKEN_/$ALLORA_WORKER_TOKEN/" config.json
 
 #reputer config str replace
 sed -i "s/_ALLORA_REPUTER_TOPIC_ID_/$ALLORA_REPUTER_TOPIC_ID/" config.json
 sed -i "s/_ALLORA_REPUTER_ENTRYPOINT_NAME_/$ALLORA_REPUTER_ENTRYPOINT_NAME/" config.json
-sed -i "s/_ALLORA_REPUTER_SOURCE_OF_TRUTH_ENDPOINT_/$ALLORA_REPUTER_SOURCE_OF_TRUTH_ENDPOINT/" config.json
+sed -i "s#_ALLORA_REPUTER_SOURCE_OF_TRUTH_ENDPOINT_#$ALLORA_REPUTER_SOURCE_OF_TRUTH_ENDPOINT#" config.json
 sed -i "s/_ALLORA_REPUTER_LOOP_SECONDS_/$ALLORA_REPUTER_LOOP_SECONDS/" config.json
 sed -i "s/_ALLORA_REPUTER_TOKEN_/$ALLORA_REPUTER_TOKEN/" config.json
 sed -i "s/_ALLORA_REPUTER_MIN_STAKE_/$ALLORA_REPUTER_MIN_STAKE/" config.json
@@ -126,12 +127,12 @@ echo 'Building inner node'
 cd source
 
 cp ~/node-repo/config.json config.json
-cp .env.example .env
+
+echo -e "$MODEL_ENV_VARS" >> .env
 
 
-#build main worker
-echo 'building main worker'
-cd ~/node-repo
+#build basic worker
+echo 'building basic worker'
 chmod +x init.config
 ./init.config
 docker-compose up --build 

lib/allora/sample-configs/.env-sample-full

@@ -5,6 +5,15 @@ ALLORA_WALLET_ADDRESS_KEY_NAME="xxxxxxxxxxx"
 ALLORA_WALLET_ADDRESS_RESTORE_MNEMONIC="xxxxxxxxxxx" #if you don't have this, generate with allocmd
 AWS_ACCOUNT_ID="xxxxxxxxxxx"
 MODEL_REPO="https://github.com/allora-network/basic-coin-prediction-node"
+MODEL_ENV_VARS='
+TOKEN="ETH"
+TRAINING_DAYS="1"
+TIMEFRAME="10min"
+MODEL="LinearRegression"
+REGION="US"
+DATA_PROVIDER="coingecko"
+CG_API_KEY="secret"
+'
 ###############################
 
 AWS_RESOURCE_NAME_PREFIX="AlloraWorkerx"
@@ -28,7 +37,7 @@ ALLORA_ENV="dev"
 ALLORA_WALLET_HOME_DIR=""
 ALLORA_WALLET_GAS="1000000"
 ALLORA_WALLET_GAS_ADJUSTMENT="1.0"
-ALLORA_WALLET_NODE_RPC="https://localhost:26657"
+ALLORA_WALLET_NODE_RPC="https://allora-rpc.testnet.allora.network"
 ALLORA_WALLET_MAX_RETRIES="1"
 ALLORA_WALLET_DELAY="1"
 ALLORA_WALLET_SUBMIT_TX="false"