Multisig support #37

ebarakos · 2021-12-15T10:54:45Z

https://github.com/project-serum/multisig/releases/tag/v0.7.0 for artifact

RodrigoAD · 2021-12-20T11:00:02Z

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

@@ -37,36 +39,90 @@ export default class SetBilling extends SolanaCommand {
    this.requireFlag('state', 'Provide a valid state address')
  }

-  execute = async () => {
+  makeRawTransaction = async (): Promise<SolanaRawTransaction> => {


This probably should return a set of txs. There could be cases where many tx are needed to perform the operation (see writeOffchainConfig)

gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/multisig/create.ts

…illing

RodrigoAD · 2022-01-10T12:33:35Z

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

+
+      this.program = this.loadProgram(this.multisig.idl, this.address)
+      const txResults = []
+      if (!this.flags.tx) {


I think we should stick to the 3 steps: create, approve and execute, and perform just one action per execution.

Create: Should create the tx proposal, and outputs the the tx public key for future actions.

Approve: Approves (we can use the --approve flag) the proposal created before. We should provide the tx public key with the proposal flag (--proposal)

Executes: Executes the proposal, if the approval is ready

Adding the single --proposal flag flow as discussed.

gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/multisig/setThreshold.ts

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

ebarakos · 2022-01-12T13:52:04Z

Current flow:

Run the command using gauntlet-serum-multisig instead of gauntlet. e.g yarn gauntlet-serum-multisig ocr2:set_billing --network=local --state=2RvzKkWPmaBNUHC8k9ffjo2vmbqUd6uPw77TnjuuswpN

Creation, approval, execution happens automatically if the proposal is eligible. If not, user is prompted to add a --proposal flag for the rest of the owners, to approve/execute it.

… to multisigSigner

RodrigoAD

It looks so much better! Just needs some final changes

RodrigoAD · 2022-01-14T10:32:34Z

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

+    proposal: PublicKey
+    multisigAddress: PublicKey
+    multisigSigner: PublicKey
+    owners: [PublicKey]
+    threshold: number


Let's try to reduce the amount of context variables. I'd only leave command, program and multisigAddress

RodrigoAD · 2022-01-14T10:34:44Z

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

+      this.require(process.env.MULTISIG_ADDRESS != null, 'Please set MULTISIG_ADDRESS env var')
+      this.multisigAddress = new PublicKey(process.env.MULTISIG_ADDRESS || '')


Move this into the constructor.

Suggested change

this.require(process.env.MULTISIG_ADDRESS != null, 'Please set MULTISIG_ADDRESS env var')

this.multisigAddress = new PublicKey(process.env.MULTISIG_ADDRESS || '')

this.require(!!process.env.MULTISIG_ADDRESS, 'Please set MULTISIG_ADDRESS env var')

this.multisigAddress = new PublicKey(process.env.MULTISIG_ADDRESS)

RodrigoAD · 2022-01-14T10:35:38Z

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

+      this.multisigAddress = new PublicKey(process.env.MULTISIG_ADDRESS || '')
+      const multisig = getContract(CONTRACT_LIST.MULTISIG, '')
+      this.program = this.loadProgram(multisig.idl, multisig.programId.toString())
+      logger.info(`Multisig Address: ${process.env.MULTISIG_ADDRESS}`)


We should already have defined this.multisigAddress here, no need to use process.env.MULTISIG_ADDRESS

RodrigoAD · 2022-01-14T10:40:28Z

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

+    wrapAction = async (action) => {
+      try {
+        const tx = await action


action seems like it's being executed already. Try to wrap the function first, then add the args you want for this new fn

Suggested change

wrapAction = async (action) => {

try {

const tx = await action

type ProposalAction = (rawTx: RawTransaction) => Promise<string>

...

wrapAction = (proposalAction: ProposalAction) => (rawTx: RawTransaction) {

try {

const tx = await proposalAction(rawTx)

You would consume it like:

this.wrapAction(this.createProposal)(rawTxs[0])

RodrigoAD · 2022-01-14T10:41:41Z

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

+    wrapAction = async (action) => {
+      try {
+        const tx = await action
+        this.inspectProposalState(this.flags.proposal)


You should not use this.flags.proposal here anymore. There should be already a validated proposal, that we receive as an argument

RodrigoAD · 2022-01-14T10:41:59Z

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

+      const tx = await this.program.rpc.createTransaction(rawTx.programId, rawTx.accounts, rawTx.data, {
+        accounts: {
+          multisig: this.multisigAddress,
+          transaction: this.flags.proposal,


Same here, no flags here anymore

RodrigoAD · 2022-01-14T10:42:39Z

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

+      const tx = await this.program.rpc.approve({
+        accounts: {
+          multisig: this.multisigAddress,
+          transaction: this.flags.proposal,


RodrigoAD · 2022-01-14T10:44:02Z

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

+      return tx
+    }
+
+    remainingApprovalsNeeded = (proposalState, threshold: number): number => {


This fn should return already a boolean indicating if it is ready for execution

refactor

ebarakos · 2022-01-14T12:41:17Z

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

+      this.require(!!process.env.MULTISIG_ADDRESS, 'Please set MULTISIG_ADDRESS env var')
+      this.multisigAddress = new PublicKey(process.env.MULTISIG_ADDRESS)
+      const multisig = getContract(CONTRACT_LIST.MULTISIG, '')
+      this.program = this.loadProgram(multisig.idl, multisig.programId.toString())


@RodrigoAD I had to move these in execute() again because I was getting errors.

RodrigoAD · 2022-01-14T13:49:52Z

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

-    const input = this.makeInput(this.flags.input)
+
+    const input = this.makeInput(
+      ({


Forgot to remove this. It should be: const input = this.makeInput(this.flags.input)

…na into multisig

ebarakos changed the title ~~Create multisig command~~ Multisig support Dec 15, 2021

ebarakos mentioned this pull request Dec 16, 2021

Multisig example #47

Closed

RodrigoAD reviewed Dec 20, 2021

View reviewed changes

Base automatically changed from feature/relay to master December 21, 2021 18:37

ebarakos and others added 10 commits December 21, 2021 19:51

Create multisig command

da5e79b

Prettier + example

347448c

Merged feature/relay and required changes for running the flow

64d7a8f

Merged example with raw transaction; removed log

a386ca2

Change threshold working

1682cc3

Abstract transaction working with JSON file

1090678

Set owners, thredhold and able to run arbitrary transactions directly

595ccf2

Formatting

937fdf1

moved multisig into its library

e949da4

fix rebase

06ac89a

RodrigoAD force-pushed the multisig branch 2 times, most recently from 7f8c0fa to 607762e Compare December 21, 2021 19:35

RodrigoAD changed the base branch from master to develop December 21, 2021 19:38

multisig command wrapper

098f710

RodrigoAD force-pushed the multisig branch from 607762e to 098f710 Compare December 21, 2021 19:40

RodrigoAD reviewed Dec 23, 2021

View reviewed changes

gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/multisig/create.ts Outdated Show resolved Hide resolved

RodrigoAD and others added 7 commits January 4, 2022 13:23

moved cli script

ba63154

Working, supporting setting threshold owners and example command setB…

60f2f5c

…illing

Prettier

a7f8aaa

Merged develop

b9a09cc

Fixed develop merge

32f069c

Merge remote-tracking branch 'origin/develop' into multisig

b32a5f0

Prettier

7dee2c8

ebarakos marked this pull request as ready for review January 10, 2022 09:51

RodrigoAD reviewed Jan 10, 2022

View reviewed changes

gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/multisig/setThreshold.ts Outdated Show resolved Hide resolved

ebarakos added 2 commits January 11, 2022 18:16

Merge remote-tracking branch 'origin/develop' into multisig

0b13f58

Fix run issue + fix approvals inspection

223315c

RodrigoAD reviewed Jan 12, 2022

View reviewed changes

gauntlet/packages/gauntlet-serum-multisig/src/commands/multisig.ts Outdated Show resolved Hide resolved

Merge remote-tracking branch 'origin/develop' into multisig

8117b9c

ebarakos marked this pull request as ready for review January 12, 2022 13:45

ebarakos added 9 commits January 13, 2022 11:10

Merge remote-tracking branch 'origin/develop' into multisig

5ff900f

Fix version issue

39d2c10

Moved multisig create to package, fixed creation parameters

f97a470

Able to execute setBilling from any proposal address, on access given…

bee8977

… to multisigSigner

Restructuring of multisig wrapper command + distint actions UX

59cfe46

Merge remote-tracking branch 'origin/develop' into multisig

0c26070

Small changes

e77b88d

Added README

3d619fb

Revert BN imports

57f6901

ebarakos requested a review from RodrigoAD January 14, 2022 09:03

RodrigoAD reviewed Jan 14, 2022

View reviewed changes

refactored multisig

bc44992

refactor

RodrigoAD force-pushed the multisig branch from d8341e6 to bc44992 Compare January 14, 2022 11:54

Fixes

f6c7206

ebarakos commented Jan 14, 2022

View reviewed changes

ebarakos added 2 commits January 14, 2022 14:44

Revert .map

380b528

Move multisigAddress to constructor

ab4637a

ebarakos requested a review from RodrigoAD January 14, 2022 13:15

RodrigoAD reviewed Jan 14, 2022

View reviewed changes

RodrigoAD added 2 commits January 14, 2022 14:53

remove set billing default value

3f17a04

Merge branch 'multisig' of github.com:smartcontractkit/chainlink-sola…

4f366d5

…na into multisig

RodrigoAD approved these changes Jan 14, 2022

View reviewed changes

ebarakos merged commit 6ca7765 into develop Jan 14, 2022

ebarakos deleted the multisig branch January 14, 2022 13:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Multisig support #37

Multisig support #37

ebarakos commented Dec 15, 2021 •

edited

Loading

RodrigoAD Dec 20, 2021 •

edited

Loading

RodrigoAD Jan 10, 2022

ebarakos Jan 11, 2022

ebarakos commented Jan 12, 2022

RodrigoAD left a comment

RodrigoAD Jan 14, 2022

RodrigoAD Jan 14, 2022

RodrigoAD Jan 14, 2022

RodrigoAD Jan 14, 2022

RodrigoAD Jan 14, 2022 •

edited

Loading

RodrigoAD Jan 14, 2022

RodrigoAD Jan 14, 2022

RodrigoAD Jan 14, 2022

ebarakos Jan 14, 2022

RodrigoAD Jan 14, 2022

		this.require(process.env.MULTISIG_ADDRESS != null, 'Please set MULTISIG_ADDRESS env var')
		this.multisigAddress = new PublicKey(process.env.MULTISIG_ADDRESS \|\| '')

-    wrapAction = async (action) => {
-      try {
-        const tx = await action
+    type ProposalAction = (rawTx: RawTransaction) => Promise<string>
+    ...
+    wrapAction = (proposalAction: ProposalAction) => (rawTx: RawTransaction) {
+      try {
+        const tx = await proposalAction(rawTx)

Multisig support #37

Multisig support #37

Conversation

ebarakos commented Dec 15, 2021 • edited Loading

RodrigoAD Dec 20, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ebarakos commented Jan 12, 2022

RodrigoAD left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

RodrigoAD Jan 14, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ebarakos commented Dec 15, 2021 •

edited

Loading

RodrigoAD Dec 20, 2021 •

edited

Loading

RodrigoAD Jan 14, 2022 •

edited

Loading