changing the way we build the node, and adding a bunch of env variables to support that

Author: Madisonw

lib/allora/allora.ts

@@ -50,4 +50,8 @@ new AlloraStack(app, 'allora-single-node', {
   alloraTopicId: process.env.ALLORA_TOPIC_ID || '3',
   alloraEnv: process.env.ALLORA_ENV || 'dev',
   alloraNetworkName: process.env.ALLORA_NETWORK_NAME || 'edgenet',
+  alloraAccountName: process.env.ALLORA_ACCOUNT_NAME || 'secret',
+  alloraAccountMnemonic: process.env.ALLORA_ACCOUNT_MNEMONIC || 'secret',
+  alloraAccountPassphrase: process.env.ALLORA_ACCOUNT_PASSPHRASE || 'secret',
+  alloraNodeRpc: process.env.ALLORA_NODE_RPC || 'https://localhost:26657',
 });

lib/allora/lib/allora-stack.ts

@@ -29,6 +29,10 @@ export interface AlloraStackProps extends cdk.StackProps {
   alloraTopicId: string;
   alloraEnv: string;
   alloraNetworkName: string;
+  alloraAccountName: string;
+  alloraAccountMnemonic: string;
+  alloraAccountPassphrase: string;
+  alloraNodeRpc: string;
 }
 
 
@@ -44,7 +48,11 @@ export class AlloraStack extends cdk.Stack {
       alloraWorkerName, 
       alloraTopicId, 
       alloraEnv, 
-      alloraNetworkName
+      alloraNetworkName,
+      alloraAccountName,
+      alloraAccountMnemonic,
+      alloraAccountPassphrase,
+      alloraNodeRpc
     } = props;
     const { region } = env;
 
@@ -131,7 +139,11 @@ export class AlloraStack extends cdk.Stack {
       _ALLORA_WORKER_NAME_: alloraWorkerName,
       _ALLORA_TOPIC_ID_: alloraTopicId,
       _ALLORA_ENV_: alloraEnv,
-      _ALLORA_NETWORK_NAME_ : alloraNetworkName
+      _ALLORA_NETWORK_NAME_ : alloraNetworkName,
+      _ALLORA_ACCOUNT_NAME_ : alloraAccountName,
+      _ALLORA_ACCOUNT_MNEMONIC_ : alloraAccountMnemonic,
+      _ALLORA_ACCOUNT_PASSPHRASE_ : alloraAccountPassphrase,
+      _ALLORA_NODE_RPC_ : alloraNodeRpc,
     });
 
    // Create UserData for EC2 instance

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

@@ -12,6 +12,10 @@ echo "ALLORA_WORKER_NAME=${_ALLORA_WORKER_NAME_}" >> /etc/environment
 echo "ALLORA_TOPIC_ID=${_ALLORA_TOPIC_ID_}" >> /etc/environment
 echo "ALLORA_ENV=${_ALLORA_ENV_}" >> /etc/environment
 echo "ALLORA_NETWORK_NAME=${_ALLORA_NETWORK_NAME_}" >> /etc/environment
+echo "ALLORA_ACCOUNT_NAME=${_ALLORA_ACCOUNT_NAME_}" >> /etc/environment
+echo "ALLORA_ACCOUNT_MNEMONIC=${_ALLORA_ACCOUNT_MNEMONIC_}" >> /etc/environment
+echo "ALLORA_ACCOUNT_PASSPHRASE=${_ALLORA_ACCOUNT_PASSPHRASE_}" >> /etc/environment
+echo "ALLORA_NODE_RPC=${_ALLORA_NODE_RPC_}" >> /etc/environment
 
 source /etc/environment
 
@@ -40,9 +44,10 @@ sudo systemctl enable docker.service
 sudo systemctl start docker.service
 
 # Install docker-compose
-sudo pip3 install docker-compose
+sudo curl -L https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
+sudo chmod +x /usr/local/bin/docker-compose
+docker-compose version
 
-allocmd generate worker --name $ALLORA_WORKER_NAME --topic $ALLORA_TOPIC_ID --env $ALLORA_ENV --network $ALLORA_NETWORK_NAME
 
 #install AWS CLI
 echo 'Installing AWS CLI v2'
@@ -54,6 +59,19 @@ ln /usr/local/bin/aws /usr/bin/aws
 
 cfn-signal -e $? --stack $STACK_NAME --resource $RESOURCE_ID --region $AWS_REGION
 
+# clone node repo
+cd ~
+git clone https://github.com/allora-network/allora-offchain-node.git node-repo
+cd node-repo
+
+touch .env
+echo "ALLORA_ACCOUNT_NAME=$ALLORA_ACCOUNT_NAME" >> .env
+echo "ALLORA_ACCOUNT_MNEMONIC=$ALLORA_ACCOUNT_MNEMONIC" >> .env
+echo "ALLORA_ACCOUNT_PASSPHRASE=$ALLORA_ACCOUNT_PASSPHRASE" >> .env
+echo "ALLORA_NODE_RPC=$ALLORA_NODE_RPC" >> .env
+
+docker-compose up --build 
+
 echo "----------------------------------------------"
 echo "[user-data] Allora user-data script successful"
 echo "----------------------------------------------"

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

@@ -1,4 +1,13 @@
+#allora node run config
+
+#Must fill all these in
+ALLORA_ACCOUNT_NAME="xxxxxxxxxxx"
+ALLORA_ACCOUNT_MNEMONIC="xxxxxxxxxxx"
+ALLORA_ACCOUNT_PASSPHRASE="xxxxxxxxxxx"
 AWS_ACCOUNT_ID="xxxxxxxxxxx"
+###############################
+
+ALLORA_NODE_RPC=https://localhost:26657
 AWS_RESOURCE_NAME_PREFIX="AlloraWorkerx"
 AWS_REGION="us-east-1"
 AWS_INSTANCE_TYPE="t3.medium"
@@ -16,4 +25,4 @@ EDGE_DATA_VOL_THROUGHPUT="125"
 ALLORA_WORKER_NAME="aws"
 ALLORA_TOPIC_ID="3"
 ALLORA_ENV="dev"
-ALLORA_NETWORK_NAME="edgenet"
+ALLORA_NETWORK_NAME="edgenet"

lib/allora/test/.env-test

@@ -1,13 +1,20 @@
-AWS_RESOURCE_NAME_PREFIX="AlloraWorkerTest"
+#allora node run config
+
+#Must fill all these in
+ALLORA_ACCOUNT_NAME="xxxxxxxxxxx"
+ALLORA_ACCOUNT_MNEMONIC="xxxxxxxxxxx"
+ALLORA_ACCOUNT_PASSPHRASE="xxxxxxxxxxx"
 AWS_ACCOUNT_ID="xxxxxxxxxxx"
+###############################
+
+ALLORA_NODE_RPC=https://localhost:26657
+AWS_RESOURCE_NAME_PREFIX="AlloraWorkerx"
 AWS_REGION="us-east-1"
-AWS_AMI_ID="ami-04b70fa74e45c3917"
-AWS_INSTANCE_TYPE="t2.medium"
+AWS_INSTANCE_TYPE="t3.medium"
 AWS_VPC_MAX_AZS="1"
 AWS_VPC_NAT_GATEWAYS="0"
 AWS_VPC_CIDR_MASK="24"
 
-
 # Data volume configuration
 EDGE_DATA_VOL_TYPE="gp3"                                                          # Other options: "io1" | "io2" | "gp3" | "instance-store" . IMPORTANT: "instance-store" NOT recommended as it is ephermal and will be reset after stopping the instance. Use "instance-store" option only with instance types that support that feature, like popular for node g4dn, d3, i3en, and i4i instance families
 EDGE_DATA_VOL_SIZE="256"                                                           # Current required data size to keep both snapshot archive and unarchived version of it (not applicable for "instance-store")