updating to new version of offchain node

Author: Madisonw

lib/allora/allora.ts

@@ -57,10 +57,19 @@ new AlloraStack(app, 'allora-single-node', {
   alloraWalletHomeDir: process.env.ALLORA_WALLET_HOME_DIR || '',
   alloraWalletGas: process.env.ALLORA_WALLET_GAS || '1000000',
   alloraWalletGasAdjustment: process.env.ALLORA_WALLET_GAS_ADJUSTMENT || '1.0',
+
+  alloraWalletGasPrices: process.env.ALLORA_WALLET_GAS_PRICES || 'auto',
+  alloraWalletGasPriceInterval: process.env.ALLORA_WALLET_GAS_PRICE_INTERVAL || '60',
+  alloraWalletRetryDelay: process.env.ALLORA_WALLET_RETRY_DELAY || '3',
+  alloraWalletBlockDurationEstimated: process.env.ALLORA_WALLET_BLOCK_DURATION_ESTIMATED || '10',
+  alloraWalletWindowCorrectionFactor: process.env.ALLORA_WALLET_WINDOW_CORRECTION_FACTOR || '0.8',
+  alloraWalletAccountSequenceRetryDelay: process.env.ALLORA_WALLET_ACCOUNT_SEQUENCE_RETRY_DELAY || '5',
+
   alloraWalletNodeRpc: process.env.ALLORA_WALLET_NODE_RPC || 'https://localhost:26657',
   alloraWalletMaxRetries: process.env.ALLORA_WALLET_MAX_RETRIES || '1',
   alloraWalletDelay: process.env.ALLORA_WALLET_DELAY || '1',
   alloraWalletSubmitTx: process.env.ALLORA_WALLET_SUBMIT_TX || 'false',
+  alloraWalletMaxFees: process.env.ALLORA_WALLET_MAX_FEES || '500000',
 
   //Worker Properties
   alloraWorkerTopicId: process.env.ALLORA_WORKER_TOPIC_ID || '1',
@@ -73,6 +82,10 @@ new AlloraStack(app, 'allora-single-node', {
   alloraReputerTopicId: process.env.ALLORA_REPUTER_TOPIC_ID || '1',
   alloraReputerEntrypointName: process.env.ALLORA_REPUTER_ENTRYPOINT_NAME || 'api-worker-reputer',
   alloraReputerSourceOfTruthEndpoint: process.env.ALLORA_REPUTER_SOURCE_OF_TRUTH_ENDPOINT || 'http://source:8888/truth/{Token}/{BlockHeight}',
+
+  alloraReputerLossFunctionService: process.env.ALLORA_REPUTER_LOSS_FUNCTION_SERVICE || 'http://localhost:5000',
+  alloraReputerLossMethodOptionsLossMethod: process.env.ALLORA_REPUTER_LOSS_METHOD_OPTIONS_LOSS_METHOD || 'sqe',
+
   alloraReputerLoopSeconds: process.env.ALLORA_REPUTER_LOOP_SECONDS || '30',
   alloraReputerToken: process.env.ALLORA_REPUTER_TOKEN || 'ethereum',
   alloraReputerMinStake: process.env.ALLORA_REPUTER_MIN_STAKE || '100000',

lib/allora/lib/allora-stack.ts

@@ -35,6 +35,15 @@ export interface AlloraStackProps extends cdk.StackProps {
   alloraWalletHomeDir: string;
   alloraWalletGas: string,
   alloraWalletGasAdjustment: string;
+
+  alloraWalletGasPrices: string;
+  alloraWalletGasPriceInterval: string;
+  alloraWalletRetryDelay: string;
+  alloraWalletBlockDurationEstimated: string;
+  alloraWalletWindowCorrectionFactor: string;
+  alloraWalletMaxFees: string;
+  alloraWalletAccountSequenceRetryDelay: string;
+
   alloraWalletNodeRpc: string;
   alloraWalletMaxRetries: string;
   alloraWalletDelay: string;
@@ -52,6 +61,9 @@ export interface AlloraStackProps extends cdk.StackProps {
   alloraReputerLoopSeconds: string;
   alloraReputerToken: string;
   alloraReputerMinStake: string;
+
+  alloraReputerLossFunctionService: string;
+  alloraReputerLossMethodOptionsLossMethod: string;
 }
 
 
@@ -75,6 +87,15 @@ export class AlloraStack extends cdk.Stack {
       alloraWalletHomeDir,
       alloraWalletGas,
       alloraWalletGasAdjustment,
+
+      alloraWalletGasPrices,
+      alloraWalletGasPriceInterval,
+      alloraWalletRetryDelay,
+      alloraWalletBlockDurationEstimated,
+      alloraWalletWindowCorrectionFactor,
+      alloraWalletMaxFees,
+      alloraWalletAccountSequenceRetryDelay,
+
       alloraWalletNodeRpc,
       alloraWalletMaxRetries,
       alloraWalletDelay,
@@ -91,6 +112,10 @@ export class AlloraStack extends cdk.Stack {
       alloraReputerTopicId,
       alloraReputerEntrypointName,
       alloraReputerSourceOfTruthEndpoint,
+
+      alloraReputerLossFunctionService,
+      alloraReputerLossMethodOptionsLossMethod,
+
       alloraReputerLoopSeconds,
       alloraReputerToken,
       alloraReputerMinStake,
@@ -187,6 +212,15 @@ export class AlloraStack extends cdk.Stack {
       _ALLORA_WALLET_HOME_DIR_: alloraWalletHomeDir,
       _ALLORA_WALLET_GAS_ADJUSTMENT_: alloraWalletGasAdjustment,
       _ALLORA_WALLET_GAS_: alloraWalletGas,
+
+      _ALLORA_WALLET_GAS_PRICES_: alloraWalletGasPrices,
+      _ALLORA_WALLET_GAS_PRICE_INTERVAL_: alloraWalletGasPriceInterval,
+      _ALLORA_WALLET_RETRY_DELAY_: alloraWalletRetryDelay,
+      _ALLORA_WALLET_BLOCK_DURATION_ESTIMATED_: alloraWalletBlockDurationEstimated,
+      _ALLORA_WALLET_WINDOW_CORRECTION_FACTOR_: alloraWalletWindowCorrectionFactor,
+      _ALLORA_WALLET_MAX_FEES_: alloraWalletMaxFees,
+      _ALLORA_WALLET_ACCOUNT_SEQUENCE_RETRY_DELAY_: alloraWalletAccountSequenceRetryDelay,
+      
       _ALLORA_WALLET_NODE_RPC_: alloraWalletNodeRpc,
       _ALLORA_WALLET_MAX_RETRIES_: alloraWalletMaxRetries,
       _ALLORA_WALLET_DELAY_: alloraWalletDelay,
@@ -203,9 +237,15 @@ export class AlloraStack extends cdk.Stack {
       _ALLORA_REPUTER_TOPIC_ID_: alloraReputerTopicId,
       _ALLORA_REPUTER_ENTRYPOINT_NAME_: alloraReputerEntrypointName,
       _ALLORA_REPUTER_SOURCE_OF_TRUTH_ENDPOINT_: alloraReputerSourceOfTruthEndpoint,
+
+      _ALLORA_REPUTER_LOSS_FUNCTION_SERVICE_: alloraReputerLossFunctionService,
+      _ALLORA_REPUTER_LOSS_METHOD_OPTIONS_LOSS_METHOD_: alloraReputerLossMethodOptionsLossMethod,
+
       _ALLORA_REPUTER_LOOP_SECONDS_: alloraReputerLoopSeconds,
       _ALLORA_REPUTER_TOKEN_: alloraReputerToken,
-      _ALLORA_REPUTER_MIN_STAKE_: alloraReputerMinStake
+      _ALLORA_REPUTER_MIN_STAKE_: alloraReputerMinStake,
+
+      
     });
 
    // Create UserData for EC2 instance

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

@@ -20,6 +20,18 @@ echo "ALLORA_WALLET_ADDRESS_RESTORE_MNEMONIC=${_ALLORA_WALLET_ADDRESS_RESTORE_MN
 echo "ALLORA_WALLET_HOME_DIR=${_ALLORA_WALLET_HOME_DIR_}" >> /etc/environment
 echo "ALLORA_WALLET_GAS_ADJUSTMENT=${_ALLORA_WALLET_GAS_ADJUSTMENT_}" >> /etc/environment
 echo "ALLORA_WALLET_GAS=${_ALLORA_WALLET_GAS_}" >> /etc/environment
+
+#new props
+echo "ALLORA_WALLET_GAS_PRICES=${_ALLORA_WALLET_GAS_PRICES_}" >> /etc/environment
+echo "ALLORA_WALLET_GAS_PRICE_INTERVAL=${_ALLORA_WALLET_GAS_PRICE_INTERVAL_}" >> /etc/environment
+echo "ALLORA_WALLET_RETRY_DELAY=${_ALLORA_WALLET_RETRY_DELAY_}" >> /etc/environment
+echo "ALLORA_WALLET_BLOCK_DURATION_ESTIMATED=${_ALLORA_WALLET_BLOCK_DURATION_ESTIMATED_}" >> /etc/environment
+echo "ALLORA_WALLET_WINDOW_CORRECTION_FACTOR=${_ALLORA_WALLET_WINDOW_CORRECTION_FACTOR_}" >> /etc/environment
+echo "ALLORA_WALLET_MAX_FEES=${_ALLORA_WALLET_MAX_FEES_}" >> /etc/environment
+echo "ALLORA_WALLET_ACCOUNT_SEQUENCE_RETRY_DELAY=${_ALLORA_WALLET_ACCOUNT_SEQUENCE_RETRY_DELAY_}" >> /etc/environment
+#/new props
+
+
 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
@@ -34,6 +46,12 @@ echo "ALLORA_WORKER_TOKEN=${_ALLORA_WORKER_TOKEN_}" >> /etc/environment
 echo "ALLORA_REPUTER_TOPIC_ID=${_ALLORA_REPUTER_TOPIC_ID_}" >> /etc/environment
 echo "ALLORA_REPUTER_ENTRYPOINT_NAME=${_ALLORA_REPUTER_ENTRYPOINT_NAME_}" >> /etc/environment
 echo "ALLORA_REPUTER_SOURCE_OF_TRUTH_ENDPOINT=${_ALLORA_REPUTER_SOURCE_OF_TRUTH_ENDPOINT_}" >> /etc/environment
+
+#new props
+echo "ALLORA_REPUTER_LOSS_FUNCTION_SERVICE=${_ALLORA_REPUTER_LOSS_FUNCTION_SERVICE_}" >> /etc/environment
+echo "ALLORA_REPUTER_LOSS_METHOD_OPTIONS_LOSS_METHOD=${_ALLORA_REPUTER_LOSS_METHOD_OPTIONS_LOSS_METHOD_}" >> /etc/environment
+#/new props
+
 echo "ALLORA_REPUTER_LOOP_SECONDS=${_ALLORA_REPUTER_LOOP_SECONDS_}" >> /etc/environment
 echo "ALLORA_REPUTER_TOKEN=${_ALLORA_REPUTER_TOKEN_}" >> /etc/environment
 echo "ALLORA_REPUTER_MIN_STAKE=${_ALLORA_REPUTER_MIN_STAKE_}" >> /etc/environment
@@ -94,24 +112,42 @@ sed -i "s/_ALLORA_WALLET_ADDRESS_KEY_NAME_/$ALLORA_WALLET_ADDRESS_KEY_NAME/" con
 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
+
+#new props
+sed -i "s/_ALLORA_WALLET_GAS_PRICE_INTERVAL_/$ALLORA_WALLET_GAS_PRICE_INTERVAL/" config.json #must go first
+sed -i "s/_ALLORA_WALLET_GAS_PRICES_/$ALLORA_WALLET_GAS_PRICES/" config.json
+sed -i "s/_ALLORA_WALLET_GAS_/$ALLORA_WALLET_GAS/" config.json #has to go last of the gas
+sed -i "s/_ALLORA_WALLET_MAX_FEES_/$ALLORA_WALLET_MAX_FEES/" config.json
+sed -i "s/_ALLORA_WALLET_RETRY_DELAY_/$ALLORA_WALLET_RETRY_DELAY/" config.json
+sed -i "s/_ALLORA_WALLET_BLOCK_DURATION_ESTIMATED_/$ALLORA_WALLET_BLOCK_DURATION_ESTIMATED/" config.json
+sed -i "s/_ALLORA_WALLET_WINDOW_CORRECTION_FACTOR_/$ALLORA_WALLET_WINDOW_CORRECTION_FACTOR/" config.json
+sed -i "s/_ALLORA_WALLET_ACCOUNT_SEQUENCE_RETRY_DELAY_/$ALLORA_WALLET_ACCOUNT_SEQUENCE_RETRY_DELAY/" config.json
+
+#/new props
+
 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
+sed -i "s/_ALLORA_WALLET_DELAY_/$ALLORA_WALLET_DELAY/" config.json #@deprecated
+sed -i "s/_ALLORA_WALLET_SUBMIT_TX_/$ALLORA_WALLET_SUBMIT_TX/" config.json #@deprecated
 
 #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_LOOP_SECONDS_/$ALLORA_WORKER_LOOP_SECONDS/" config.json
+sed -i "s/_ALLORA_WORKER_LOOP_SECONDS_/$ALLORA_WORKER_LOOP_SECONDS/" config.json #@deprecated
 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_LOOP_SECONDS_/$ALLORA_REPUTER_LOOP_SECONDS/" config.json
+
+#new props
+sed -i "s#_ALLORA_REPUTER_LOSS_FUNCTION_SERVICE_#$ALLORA_REPUTER_LOSS_FUNCTION_SERVICE#" config.json
+sed -i "s/_ALLORA_REPUTER_LOSS_METHOD_OPTIONS_LOSS_METHOD_/$ALLORA_REPUTER_LOSS_METHOD_OPTIONS_LOSS_METHOD/" config.json
+#/new props
+
+sed -i "s/_ALLORA_REPUTER_LOOP_SECONDS_/$ALLORA_REPUTER_LOOP_SECONDS/" config.json #@deprecated
 sed -i "s/_ALLORA_REPUTER_TOKEN_/$ALLORA_REPUTER_TOKEN/" config.json
 sed -i "s/_ALLORA_REPUTER_MIN_STAKE_/$ALLORA_REPUTER_MIN_STAKE/" config.json
 

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

@@ -37,6 +37,15 @@ ALLORA_ENV="dev"
 ALLORA_WALLET_HOME_DIR=""
 ALLORA_WALLET_GAS="1000000"
 ALLORA_WALLET_GAS_ADJUSTMENT="1.0"
+
+ALLORA_WALLET_GAS_PRICES="auto"
+ALLORA_WALLET_GAS_PRICE_INTERVAL="60"
+ALLORA_WALLET_RETRY_DELAY="3"
+ALLORA_WALLET_BLOCK_DURATION_ESTIMATED="10"
+ALLORA_WALLET_WINDOW_CORRECTION_FACTOR="0.8"
+ALLORA_WALLET_MAX_FEES="500000"
+ALLORA_WALLET_ACCOUNT_SEQUENCE_RETRY_DELAY="5"
+
 ALLORA_WALLET_NODE_RPC="https://allora-rpc.testnet.allora.network"
 ALLORA_WALLET_MAX_RETRIES="1"
 ALLORA_WALLET_DELAY="1"
@@ -46,6 +55,10 @@ ALLORA_WALLET_SUBMIT_TX="false"
 ALLORA_WORKER_TOPIC_ID="1"
 ALLORA_WORKER_INFERENCE_ENTRYPOINT_NAME="api-worker-reputer"
 ALLORA_WORKER_INFERENCE_ENDPOINT="http://source:8000/inference/{Token}"
+
+ALLORA_REPUTER_LOSS_FUNCTION_SERVICE="http://localhost:5000"
+ALLORA_REPUTER_LOSS_METHOD_OPTIONS_LOSS_METHOD="sqe"
+
 ALLORA_WORKER_LOOP_SECONDS="30"
 ALLORA_WORKER_TOKEN="ethereum"