gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: support multiple Transaction signatures

Browse Source
This commit is contained in:
Michael Vines
2018-11-18 08:48:14 -08:00
parent 5311ed7f68
commit fa7e2722d1
13 changed files with 101 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web3.js/examples/budget-timestamp.js
View File

@ -76,7 +76,7 @@ showBalance()
0,
solanaWeb3.BudgetProgram.programId,
);
return connection.sendTransaction(account1, transaction);
return connection.sendTransaction(transaction, account1);
})
.then(confirmTransaction)
.then(showBalance)
@ -89,7 +89,7 @@ showBalance()
solanaWeb3.BudgetProgram.space,
solanaWeb3.BudgetProgram.programId,
);
return connection.sendTransaction(account1, transaction);
return connection.sendTransaction(transaction, account1);
})
.then(confirmTransaction)
.then(showBalance)
@ -105,7 +105,7 @@ showBalance()
new Date('2050'),
),
);
return connection.sendTransaction(contractFunds, transaction);
return connection.sendTransaction(transaction, contractFunds);
})
.then(confirmTransaction)
.then(showBalance)
@ -117,7 +117,7 @@ showBalance()
account2.publicKey,
new Date('2050'),
);
return connection.sendTransaction(account1, transaction);
return connection.sendTransaction(transaction, account1);
})
.then(confirmTransaction)
.then(showBalance)

14
web3.js/examples/budget-two-approvers.js
View File

@ -74,7 +74,7 @@ showBalance()
approver1.publicKey,
1,
);
return connection.sendTransaction(account1, transaction);
return connection.sendTransaction(transaction, account1);
})
.then(confirmTransaction)
.then(() => {
@ -84,7 +84,7 @@ showBalance()
approver2.publicKey,
1,
);
return connection.sendTransaction(account1, transaction);
return connection.sendTransaction(transaction, account1);
})
.then(confirmTransaction)
.then(showBalance)
@ -97,7 +97,7 @@ showBalance()
0,
solanaWeb3.BudgetProgram.programId,
);
return connection.sendTransaction(account1, transaction);
return connection.sendTransaction(transaction, account1);
})
.then(confirmTransaction)
.then(showBalance)
@ -110,7 +110,7 @@ showBalance()
solanaWeb3.BudgetProgram.space,
solanaWeb3.BudgetProgram.programId,
);
return connection.sendTransaction(account1, transaction);
return connection.sendTransaction(transaction, account1);
})
.then(confirmTransaction)
.then(showBalance)
@ -124,7 +124,7 @@ showBalance()
solanaWeb3.BudgetProgram.signatureCondition(approver1.publicKey),
solanaWeb3.BudgetProgram.signatureCondition(approver2.publicKey),
);
return connection.sendTransaction(contractFunds, transaction);
return connection.sendTransaction(transaction, contractFunds);
})
.then(confirmTransaction)
.then(showBalance)
@ -135,7 +135,7 @@ showBalance()
contractState.publicKey,
account2.publicKey,
);
return connection.sendTransaction(approver1, transaction);
return connection.sendTransaction(transaction, approver1);
})
.then(confirmTransaction)
.then(showBalance)
@ -146,7 +146,7 @@ showBalance()
contractState.publicKey,
account2.publicKey,
);
return connection.sendTransaction(approver2, transaction);
return connection.sendTransaction(transaction, approver2);
})
.then(confirmTransaction)
.then(showBalance)