refactor

packages-ts/gauntlet-terra-contracts/networks/.env.bombay-testnet

@@ -4,5 +4,6 @@ DEFAULT_GAS_PRICE=0.5
 LINK=terra1fcksmfjncl6m7apvpalvhwv5jxd9djv5lwyu82
 BILLING_ACCESS_CONTROLLER=terra1trcufj64y53hxk7g8cra33xw3jkyvlr9lu99eu
 REQUESTER_ACCESS_CONTROLLER=terra1s38kfu4qp0ttwxkka9zupaysefl5qruhv5rc0z
-MULTISIG_GROUP=terra168lv95kfm49y9zu0409jmplj756ukxdrew7uta
-MULTISIG_WALLET=terra1u89pduw4enewduy9qydj925738cyn9juszgj54
+
+CW4_GROUP=terra1edk45cc6rckjszfmr87qfx50pfn2mnhg5mn3vd
+CW3_FLEX_MULTISIG=terra1cql0r4csmce0ntf68dmkvu3negs7m662uyg90g

packages-ts/gauntlet-terra-contracts/src/index.ts

@@ -1,5 +1,5 @@
 import { executeCLI } from '@chainlink/gauntlet-core'
-import { multisigWrapCommand } from '@chainlink/gauntlet-terra-cw20-multisig'
+import { multisigWrapCommand } from '@chainlink/gauntlet-terra-cw-plus'
 import { existsSync } from 'fs'
 import path from 'path'
 import { io } from '@chainlink/gauntlet-core/dist/utils'

packages-ts/gauntlet-terra-contracts/src/lib/constants.ts

@@ -11,7 +11,7 @@ export const enum CATEGORIES {
   DEVIATION_FLAGGING_VALIDATOR = 'Devaiation Flagging Validator',
 }
 
-export const DEFAULT_RELEASE_VERSION = 'v0.0.4'
+export const DEFAULT_RELEASE_VERSION = 'local'
 export const DEFAULT_CWPLUS_VERSION = 'v0.9.1'
 
 export const ORACLES_MAX_LENGTH = 31

packages-ts/gauntlet-terra-cw-plus/README.md

@@ -0,0 +1 @@
+# Gauntlet Terra CW Plus

packages-ts/gauntlet-terra-cw20-multisig/package.json → packages-ts/gauntlet-terra-cw-plus/package.json

@@ -1,7 +1,7 @@
 {
-  "name": "@chainlink/gauntlet-terra-cw20-multisig",
+  "name": "@chainlink/gauntlet-terra-cw-plus",
   "version": "0.0.1",
-  "description": "Gauntlet Terra Cw20 Multisig",
+  "description": "Gauntlet Terra CW Plus contracts",
   "keywords": [
     "typescript",
     "cli"

packages-ts/gauntlet-terra-cw20-multisig/src/commands/multisig.ts → packages-ts/gauntlet-terra-cw-plus/src/commands/multisig.ts

@@ -60,19 +60,19 @@ export const wrapCommand = (command) => {
 
       this.command = new command(flags, args)
 
-      if (!AccAddress.validate(process.env.MULTISIG_ADDRESS)) throw new Error(`Invalid Multisig wallet address`)
-      if (!AccAddress.validate(process.env.MULTISIG_GROUP)) throw new Error(`Invalid Multisig group address`)
-      this.multisig = process.env.MULTISIG_ADDRESS as AccAddress
-      this.multisigGroup = process.env.MULTISIG_GROUP as AccAddress
+      if (!AccAddress.validate(process.env.CW3_FLEX_MULTISIG)) throw new Error(`Invalid Multisig wallet address`)
+      if (!AccAddress.validate(process.env.CW4_GROUP)) throw new Error(`Invalid Multisig group address`)
+      this.multisig = process.env.CW3_FLEX_MULTISIG as AccAddress
+      this.multisigGroup = process.env.CW4_GROUP as AccAddress
     }
 
     makeRawTransaction = async (signer: AccAddress, state?: State) => {
       const message = await this.command.makeRawTransaction(this.multisig)
 
       const operations = {
-        [Action.CREATE]: this.executePropose,
-        [Action.APPROVE]: this.executeApproval,
-        [Action.EXECUTE]: this.executeExecution,
+        [Action.CREATE]: this.makeProposeTransaction,
+        [Action.APPROVE]: this.makeAcceptTransaction,
+        [Action.EXECUTE]: this.makeExecuteTransaction,
         [Action.NONE]: () => {
           throw new Error('No action needed')
         },
@@ -104,7 +104,7 @@ export const wrapCommand = (command) => {
       }
     }
 
-    executePropose: ProposalAction = async (signer, _, message) => {
+    makeProposeTransaction: ProposalAction = async (signer, _, message) => {
       logger.info('Generating data for creating new proposal')
       const proposeInput = {
         propose: {
@@ -118,7 +118,7 @@ export const wrapCommand = (command) => {
       return new MsgExecuteContract(signer, this.multisig, proposeInput)
     }
 
-    executeApproval: ProposalAction = async (signer, proposalId) => {
+    makeAcceptTransaction: ProposalAction = async (signer, proposalId) => {
       logger.info(`Generating data for approving proposal ${proposalId}`)
       const approvalInput = {
         vote: {
@@ -129,7 +129,7 @@ export const wrapCommand = (command) => {
       return new MsgExecuteContract(signer, this.multisig, approvalInput)
     }
 
-    executeExecution: ProposalAction = async (signer, proposalId) => {
+    makeExecuteTransaction: ProposalAction = async (signer, proposalId) => {
       logger.info(`Generating data for executing proposal ${proposalId}`)
       const executeInput = {
         execute: {

packages-ts/gauntlet-terra/src/commands/internal/terra.ts

@@ -76,12 +76,10 @@ export default abstract class TerraCommand extends WriteCommand<TransactionRespo
 
       logger.loading('Sending transaction...')
       const res = await this.provider.tx.broadcast(tx)
-
-      logger.debug(res)
       return this.wrapResponse(res)
     } catch (e) {
-      const details = e.response.data
-      throw new Error(details.message)
+      const message = e?.response?.data?.message || e.message
+      throw new Error(message)
     }
   }
 
@@ -96,8 +94,6 @@ export default abstract class TerraCommand extends WriteCommand<TransactionRespo
     })
 
     const res = await this.provider.tx.broadcast(tx)
-
-    logger.debug(res)
     return this.wrapResponse(res)
   }
 

tsconfig.json

@@ -7,7 +7,7 @@
       "path": "./packages-ts/gauntlet-terra"
     },
     {
-      "path": "./packages-ts/gauntlet-terra-cw20-multisig"
+      "path": "./packages-ts/gauntlet-terra-cw-plus"
     },
     {
       "path": "./packages-ts/gauntlet-terra-contracts"