Multisig batching

.tool-versions

@@ -1,5 +1,5 @@
-nodejs 14.19.1
-rust 1.59.0
+nodejs 18.6.0
+rust 1.64.0
 golang 1.19.3
 golangci-lint 1.45.2
 pulumi 3.40.1

Makefile

@@ -53,7 +53,7 @@ projectserum_version:
 	@echo "${PROJECT_SERUM_VERSION}"
 
 anchor_shell:
-	docker run --rm -it -v $(shell pwd):/workdir --entrypoint bash ${PROJECT_SERUM_IMAGE}
+	docker run --rm -it -v $(shell pwd):/workdir -p 8899:8899 -p 8900:8900 --entrypoint bash ${PROJECT_SERUM_IMAGE}
 
 build_js:
 	cd gauntlet && yarn install --frozen-lockfile && yarn bundle

gauntlet/jest.config.js

@@ -11,6 +11,10 @@ module.exports = {
           tsconfig: '<rootDir>/packages/gauntlet-solana/tsconfig.json',
         },
       },
+      moduleNameMapper: {
+        // workaround for https://github.com/LedgerHQ/ledger-live/issues/763
+        '@ledgerhq/devices/hid-framing': '<rootDir>/node_modules/@ledgerhq/devices/lib/hid-framing.js',
+      },
     },
     {
       displayName: 'gauntlet-solana-contracts',
@@ -22,6 +26,10 @@ module.exports = {
           tsconfig: '<rootDir>/packages/gauntlet-solana-contracts/tsconfig.json',
         },
       },
+      moduleNameMapper: {
+        // workaround for https://github.com/LedgerHQ/ledger-live/issues/763
+        '@ledgerhq/devices/hid-framing': '<rootDir>/node_modules/@ledgerhq/devices/lib/hid-framing.js',
+      },
     },
   ],
 }

gauntlet/package.json

@@ -54,6 +54,6 @@
     "secp256k1": "^4.0.2",
     "ts-jest": "^26.4.3",
     "ts-node": "^8.3.0",
-    "typescript": "4.3.5"
+    "typescript": "4.9.3"
   }
 }

gauntlet/packages/gauntlet-serum-multisig/package.json

@@ -25,7 +25,7 @@
     "bundle": "yarn build && pkg ."
   },
   "dependencies": {
-    "@chainlink/gauntlet-core": "0.1.2",
+    "@chainlink/gauntlet-core": "0.5.0",
     "@chainlink/gauntlet-solana": "*",
     "@project-serum/anchor": "^0.25.0",
     "@solana/web3.js": "^1.50.1"

gauntlet/packages/gauntlet-serum-multisig/src/commands/approve.ts

@@ -0,0 +1,45 @@
+import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { PublicKey } from '@solana/web3.js'
+import { Result } from '@chainlink/gauntlet-core'
+import { logger } from '@chainlink/gauntlet-core/dist/utils'
+import { CONTRACT_LIST, getContract } from '../lib/contracts'
+
+export default class Approve extends SolanaCommand {
+  static id = 'serum_multisig:approve'
+  static category = CONTRACT_LIST.MULTISIG
+
+  static examples = ['yarn gauntlet serum_multisig:approve --network=local [IDS...]']
+
+  constructor(flags, args) {
+    super(flags, args)
+  }
+  makeRawTransaction = async (signer: PublicKey) => {
+    const multisigAddress = new PublicKey(process.env.MULTISIG_ADDRESS || '')
+    const multisig = getContract(CONTRACT_LIST.MULTISIG)
+    const address = multisig.programId.toString()
+    const program = this.loadProgram(multisig.idl, address)
+
+    logger.info(`Approving transactions: ${this.args}`)
+
+    // map ids over this
+    const ixs = await Promise.all(
+      this.args.map((tx) =>
+        program.methods
+          .approve()
+          .accounts({
+            multisig: multisigAddress,
+            transaction: new PublicKey(tx),
+            owner: signer,
+          })
+          .instruction(),
+      ),
+    )
+
+    return ixs
+  }
+
+  //execute not needed, this command cannot be ran outside of multisig
+  execute = async () => {
+    return {} as Result<TransactionResponse>
+  }
+}

gauntlet/packages/gauntlet-serum-multisig/src/commands/multisig.ts

@@ -1,7 +1,7 @@
 import { SolanaCommand, utils } from '@chainlink/gauntlet-solana'
 import { logger, BN, prompt } from '@chainlink/gauntlet-core/dist/utils'
 import { PublicKey, Keypair, TransactionInstruction, SystemProgram, AccountMeta } from '@solana/web3.js'
-import { Idl, Program } from '@project-serum/anchor'
+import { Program } from '@project-serum/anchor'
 import { MAX_BUFFER_SIZE } from '../lib/constants'
 import { isDeepEqual } from '../lib/utils'
 import { CONTRACT_LIST, getContract } from '../lib/contracts'
@@ -97,13 +97,13 @@ export const wrapCommand = (command) => {
       if (!lastValidBlockHeight) {
         throw new Error('Block not found. Could not generate message data')
       }
-      const tx = utils.makeTx(rawTxs, {
-        blockhash,
-        lastValidBlockHeight,
-        feePayer: signer,
+      const tx = utils.makeTx({
+        instructions: rawTxs,
+        recentBlockhash: blockhash,
+        payerKey: signer,
       })
 
-      const msgData = tx.serializeMessage().toString('base64')
+      const msgData = Buffer.from(tx.serialize()).toString('base64')
       logger.line()
       logger.success(`Message generated with blockhash ID: ${blockhash.toString()}). MESSAGE DATA:`)
       logger.log()

gauntlet/packages/gauntlet-solana-contracts/README.md

@@ -62,31 +62,11 @@ yarn gauntlet <contract_name>:<contract_function> --help
 
 ## Testing Locally
 
-### Preparation
-
-- Include program keypairs under `/packages/gauntlet-solana-contracts/artifacts/programId/*.json`, resulting in:
-
-```
-packages/gauntlet-solana-contracts/artifacts/programId
-|  access_controller.json
-|  store.json
-|  ocr2.json
-```
-
-- Make sure these accounts public keys correspond to the ones declared on each contract `declare_id`. If they don't, compile the contracts (`anchor build`) with the correct `declare_id` and move the generated binaries from `/target/deploy/*.so` to `/packages/gauntlet-solana-contracts/artifacts/bin/*.so`
-
-- Run a local store node
-
 ```
-solana config set --url http://127.0.0.1:8899
-solana-test-store -r
+scripts/localnet.sh
 ```
 
-- Get some SOL on your account. This account needs to be the same specified on gauntlet `.env` `PRIVATE_KEY`
-
-```
-solana airdrop 100 9ohrpVDVNKKW1LipksFrmq6wa1oLLYL9QSoYUn4pAQ2v
-```
+Starts a `solana-test-validator` with the programs pre-loaded and airdrops funds to the default PRIVATE_KEY used by `.env.local`.
 
 ### Running
 

gauntlet/packages/gauntlet-solana-contracts/networks/.env.local

@@ -1,10 +1,13 @@
 NODE_URL=http://127.0.0.1:8899
-PROGRAM_ID_OCR2=E3j24rx12SyVsG6quKuZPbQqZPkhAUCh8Uek4XrKYD2x
-PROGRAM_ID_ACCESS_CONTROLLER=2ckhep7Mvy1dExenBqpcdevhRu7CLuuctMcx7G9mWEvo
-PROGRAM_ID_STORE=9kRNTZmoZSiTBuXC62dzK9E7gC7huYgcmRRhYv3i4osC
 
-LINK=9TD23DYGTgUSVGWMjQVZ9cqLrvFRbzJ7MguUncfDLbSG
+export PRIVATE_KEY=[9,218,36,113,218,176,180,196,27,75,171,187,105,81,84,58,52,79,85,169,125,13,0,102,214,246,82,252,133,222,160,252,193,218,154,28,253,34,136,185,53,68,165,141,248,188,247,143,17,100,91,130,75,49,212,131,37,18,151,175,201,153,131,185]
 
-BILLING_ACCESS_CONTROLLER=2KeBZNtEhe9ws5n7czJxYyAYvTfzD6vMEYWHvACxMGWd
-REQUESTER_ACCESS_CONTROLLER=5UF9xKW9rjJJTzwSmvf6EKTkwTnp8RspVCXNtE4xX59d
-LOWERING_ACCESS_CONTROLLER=5UF9xKW9rjJJTzwSmvf6EKTkwTnp8RspVCXNtE4xX59d
+PROGRAM_ID_OCR2=cjg3oHmg9uuPsP8D6g29NWvhySJkdYdAo9D25PRbKXJ
+PROGRAM_ID_ACCESS_CONTROLLER=9xi644bRR8birboDGdTiwBq3C7VEeR7VuamRYYXCubUW
+PROGRAM_ID_STORE=HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny
+
+# LINK=9TD23DYGTgUSVGWMjQVZ9cqLrvFRbzJ7MguUncfDLbSG
+
+# BILLING_ACCESS_CONTROLLER=2KeBZNtEhe9ws5n7czJxYyAYvTfzD6vMEYWHvACxMGWd
+# REQUESTER_ACCESS_CONTROLLER=5UF9xKW9rjJJTzwSmvf6EKTkwTnp8RspVCXNtE4xX59d
+# LOWERING_ACCESS_CONTROLLER=5UF9xKW9rjJJTzwSmvf6EKTkwTnp8RspVCXNtE4xX59d

gauntlet/packages/gauntlet-solana-contracts/package.json

@@ -25,12 +25,15 @@
     "bundle": "yarn build && pkg ."
   },
   "dependencies": {
-    "@chainlink/gauntlet-core": "0.1.2",
-    "@chainlink/gauntlet-solana": "*",
+    "@chainlink/gauntlet-core": "0.5.0",
     "@chainlink/gauntlet-serum-multisig": "*",
+    "@chainlink/gauntlet-solana": "*",
     "@ethersproject/keccak256": "^5.5.0",
     "@solana/spl-token": "^0.2.0",
-    "@solana/web3.js": "^1.50.1",
+    "@solana/web3.js": "^1.64.0",
     "protobufjs": "^6.11.2"
+  },
+  "overrides": {
+    "@solana/web3.js": "^1.64.0"
   }
 }

gauntlet/packages/gauntlet-solana-contracts/src/commands/abstract/index.ts

@@ -55,7 +55,7 @@ const parseInstruction = async (instruction: string, version: string): Promise<A
   const command = instruction.split(':')
   if (!command.length || command.length > 2) return
 
-  const contract = isValidContract(command[0]) && (await getDeploymentContract(command[0] as CONTRACT_LIST, version))
+  const contract = isValidContract(command[0]) && getDeploymentContract(command[0] as CONTRACT_LIST, version)
   if (!contract) throw new Error(`Abstract: Contract ${command[0]} not found`)
 
   if (command[1] === SOLANA_OPERATIONS.HELP) {

gauntlet/packages/gauntlet-solana-contracts/src/commands/abstract/upgrade.ts

@@ -73,7 +73,7 @@ export const makeUpgradeProgramCommand = (contractId: CONTRACT_LIST): SolanaCons
       const rawTx = await this.makeRawTransaction(this.wallet.payer.publicKey)
       await prompt(`Continue upgrading the ${contractId} program?`)
       logger.loading('Upgrading program...')
-      const txhash = await this.provider.sendAndConfirm(utils.makeTx(rawTx), [this.wallet.payer])
+      const txhash = await this.signAndSendRawTx(rawTx)
       logger.success(`Program upgraded on tx ${txhash}`)
       return {
         responses: [

gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/index.ts

@@ -14,11 +14,7 @@ import { CONTRACT_LIST } from '../../../lib/contracts'
 import { makeTransferOwnershipCommand } from '../ownership/transferOwnership'
 import { makeUpgradeProgramCommand } from '../../abstract/upgrade'
 import Fund from './fund'
-import CreateProposal from './proposal/createProposal'
 import ProposeConfig from './proposeConfig'
-import ProposeOffchainConfig from './proposeOffchainConfig'
-import ProposePayees from './proposePayees'
-import FinalizeProposal from './proposal/finalizeProposal'
 import Close from './close'
 import WithdrawFunds from './withdrawFunds'
 import WithdrawPayment from './withdrawPayment'
@@ -36,11 +32,7 @@ export default [
   OCR2InitializeFlow,
   SetBilling,
   AcceptProposal,
-  CreateProposal,
-  FinalizeProposal,
   ProposeConfig,
-  ProposeOffchainConfig,
-  ProposePayees,
   ReadState,
   SetBillingAccessController,
   SetRequesterAccessController,

gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/initialize.flow.ts

@@ -8,11 +8,7 @@ import { logger, prompt } from '@chainlink/gauntlet-core/dist/utils'
 import OCR2Inspect from './inspection/inspect'
 import CreateFeed from '../store/createFeed'
 import SetWriter from '../store/setWriter'
-import CreateProposal from './proposal/createProposal'
-import ProposeOffchainConfig from './proposeOffchainConfig'
 import ProposeConfig from './proposeConfig'
-import ProposePayees from './proposePayees'
-import FinalizeProposal from './proposal/finalizeProposal'
 import AcceptProposal from './proposal/acceptProposal'
 
 export default class OCR2InitializeFlow extends FlowCommand<TransactionResponse> {
@@ -70,40 +66,8 @@ export default class OCR2InitializeFlow extends FlowCommand<TransactionResponse>
       },
       {
         id: this.stepIds.PROPOSAL,
-        name: 'Create Proposal',
-        command: CreateProposal,
-      },
-      {
         name: 'Propose Config',
         command: ProposeConfig,
-        flags: {
-          proposalId: FlowCommand.ID.data(this.stepIds.PROPOSAL, 'proposal'),
-        },
-        args: [FlowCommand.ID.contract(this.stepIds.OCR_2)],
-      },
-      {
-        id: this.stepIds.PROPOSE_OFFCHAIN,
-        name: 'Propose Offchain Config',
-        command: ProposeOffchainConfig,
-        flags: {
-          proposalId: FlowCommand.ID.data(this.stepIds.PROPOSAL, 'proposal'),
-        },
-        args: [FlowCommand.ID.contract(this.stepIds.OCR_2)],
-      },
-      {
-        name: 'Propose Payees',
-        command: ProposePayees,
-        flags: {
-          proposalId: FlowCommand.ID.data(this.stepIds.PROPOSAL, 'proposal'),
-        },
-        args: [FlowCommand.ID.contract(this.stepIds.OCR_2)],
-      },
-      {
-        name: 'Finalize Proposal',
-        command: FinalizeProposal,
-        flags: {
-          proposalId: FlowCommand.ID.data(this.stepIds.PROPOSAL, 'proposal'),
-        },
         args: [FlowCommand.ID.contract(this.stepIds.OCR_2)],
       },
       {