Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update myalgo packages #770

Merged
merged 2 commits into from
Aug 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"dependencies": {
"@json-rpc-tools/utils": "^1.7.6",
"@randlabs/myalgo-connect": "^1.1.2",
"@randlabs/myalgo-connect": "^1.2.0",
"@walletconnect/client": "^1.6.6",
"@walletconnect/types": "^1.7.1",
"algorand-walletconnect-qrcode-modal": "^1.7.4",
Expand Down
18 changes: 12 additions & 6 deletions packages/web/src/lib/myalgowallet-mode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import type {
ConnectionSettings,
EncodedTransaction,
SignedTx,
SignTransactionOptions,
} from "@randlabs/myalgo-connect";
import algosdk, { Transaction } from "algosdk";

Expand All @@ -29,17 +30,21 @@ interface MyAlgoConnect {
* @async
* @description Sign an Algorand Transaction.
* @param transaction Expect a valid Algorand transaction
* @param signOptions Sign transactions options object.
* @returns Returns signed transaction
*/
signTransaction(transaction: AlgorandTxn | EncodedTransaction): Promise<SignedTx>;
signTransaction(transaction: AlgorandTxn | EncodedTransaction,
signOptions?: SignTransactionOptions): Promise<SignedTx>;

/**
* @async
* @description Sign an Algorand Transaction.
* @param transaction Expect a valid Algorand transaction array.
* @param signOptions Sign transactions options object.
* @returns Returns signed an array of signed transactions.
*/
signTransaction(transaction: (AlgorandTxn | EncodedTransaction)[]): Promise<SignedTx[]>;
signTransaction(transaction: (AlgorandTxn | EncodedTransaction)[],
signOptions?: SignTransactionOptions): Promise<SignedTx[]>;

/**
* @async
Expand Down Expand Up @@ -90,8 +95,8 @@ export class MyAlgoWalletSession {
* @param txn { SDK transaction object, shouldSign, signers, msig } object
* @returns raw signed txn
*/
async signTransaction(txn: algosdk.Transaction): Promise<SignedTx> {
return await this.connector.signTransaction(txn.toByte());
async signTransaction(txn: algosdk.Transaction, signOptions?: SignTransactionOptions): Promise<SignedTx> {
return await this.connector.signTransaction(txn.toByte(), signOptions);
}

/**
Expand All @@ -101,11 +106,12 @@ export class MyAlgoWalletSession {
* @returns array of raw signed txns | null. null representes that the txn in array is NOT signed
* by wallet user (i.e signable by someone else).
*/
async signTransactionGroup(txns: TransactionInGroup[]): Promise<SignedTx[]> {
async signTransactionGroup(txns: TransactionInGroup[],
signOptions?: SignTransactionOptions): Promise<SignedTx[]> {
const txnsGroup = txns.map((v) => v.txn);
const groupID = algosdk.computeGroupID(txnsGroup);
for (let i = 0; i < txns.length; i++) txnsGroup[i].group = groupID;
return await this.connector.signTransaction(txnsGroup.map((txn) => txn.toByte()));
return await this.connector.signTransaction(txnsGroup.map((txn) => txn.toByte()), signOptions);
}

/**
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ __metadata:
resolution: "@algo-builder/web@workspace:packages/web"
dependencies:
"@json-rpc-tools/utils": ^1.7.6
"@randlabs/myalgo-connect": ^1.1.2
"@randlabs/myalgo-connect": ^1.2.0
"@types/chai": ^4.3.0
"@types/debug": ^4.1.7
"@types/mocha": ^9.1.0
Expand Down Expand Up @@ -556,12 +556,12 @@ __metadata:
languageName: node
linkType: hard

"@randlabs/myalgo-connect@npm:^1.1.2":
version: 1.1.2
resolution: "@randlabs/myalgo-connect@npm:1.1.2"
"@randlabs/myalgo-connect@npm:^1.2.0":
version: 1.2.0
resolution: "@randlabs/myalgo-connect@npm:1.2.0"
dependencies:
"@randlabs/communication-bridge": ^1.0.0
checksum: 4932c0704272eebf88e825821ffa0f16402751f1063030b3bee18fdc62764f63f978c3cc4a832f29b61cdea5cbb340bcc97a0eb048be176d53f18b7eaa7ab74f
checksum: 3ea50cce5689c02228234487c493d62980861bde7299068fb0adcacc4cd1431cd88a9b3110787251525b04224d623d59c1d164b273625f92df3c310ab269a1d9
languageName: node
linkType: hard

Expand Down