From 68518f080a5006edfbc99d69d7b1e98a2a6de018 Mon Sep 17 00:00:00 2001 From: MAC Date: Fri, 19 Aug 2022 13:34:25 +0700 Subject: [PATCH 1/2] update myalgo packages --- packages/web/package.json | 2 +- packages/web/src/lib/myalgowallet-mode.ts | 13 +++++++++---- yarn.lock | 10 +++++----- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/packages/web/package.json b/packages/web/package.json index 392330ea2..ebc92273e 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -33,7 +33,7 @@ }, "dependencies": { "@json-rpc-tools/utils": "^1.7.6", - "@randlabs/myalgo-connect": "^1.1.2", + "@randlabs/myalgo-connect": "^1.1.3", "@walletconnect/client": "^1.6.6", "@walletconnect/types": "^1.7.1", "algorand-walletconnect-qrcode-modal": "^1.7.4", diff --git a/packages/web/src/lib/myalgowallet-mode.ts b/packages/web/src/lib/myalgowallet-mode.ts index 9ee6af88a..86f74b522 100644 --- a/packages/web/src/lib/myalgowallet-mode.ts +++ b/packages/web/src/lib/myalgowallet-mode.ts @@ -6,6 +6,7 @@ import type { ConnectionSettings, EncodedTransaction, SignedTx, + SignTransactionOptions, } from "@randlabs/myalgo-connect"; import algosdk, { Transaction } from "algosdk"; @@ -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; + signTransaction(transaction: AlgorandTxn | EncodedTransaction, + signOptions?: SignTransactionOptions): Promise; /** * @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; + signTransaction(transaction: (AlgorandTxn | EncodedTransaction)[], + signOptions?: SignTransactionOptions): Promise; /** * @async @@ -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 { - return await this.connector.signTransaction(txn.toByte()); + async signTransaction(txn: algosdk.Transaction, signOptions?: SignTransactionOptions): Promise { + return await this.connector.signTransaction(txn.toByte(), signOptions); } /** diff --git a/yarn.lock b/yarn.lock index c8e2c7410..c7a562bec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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.1.3 "@types/chai": ^4.3.0 "@types/debug": ^4.1.7 "@types/mocha": ^9.1.0 @@ -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.1.3": + 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 From d1cf64aafcd1adc7d1c744b0270393c9356031ca Mon Sep 17 00:00:00 2001 From: MAC Date: Tue, 23 Aug 2022 13:33:27 +0700 Subject: [PATCH 2/2] Change myalgo version --- packages/web/package.json | 2 +- packages/web/src/lib/myalgowallet-mode.ts | 5 +++-- yarn.lock | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/web/package.json b/packages/web/package.json index ebc92273e..a9e6a4c4b 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -33,7 +33,7 @@ }, "dependencies": { "@json-rpc-tools/utils": "^1.7.6", - "@randlabs/myalgo-connect": "^1.1.3", + "@randlabs/myalgo-connect": "^1.2.0", "@walletconnect/client": "^1.6.6", "@walletconnect/types": "^1.7.1", "algorand-walletconnect-qrcode-modal": "^1.7.4", diff --git a/packages/web/src/lib/myalgowallet-mode.ts b/packages/web/src/lib/myalgowallet-mode.ts index 86f74b522..732ec6e5e 100644 --- a/packages/web/src/lib/myalgowallet-mode.ts +++ b/packages/web/src/lib/myalgowallet-mode.ts @@ -106,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 { + async signTransactionGroup(txns: TransactionInGroup[], + signOptions?: SignTransactionOptions): Promise { 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); } /** diff --git a/yarn.lock b/yarn.lock index c7a562bec..92c75bac6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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.3 + "@randlabs/myalgo-connect": ^1.2.0 "@types/chai": ^4.3.0 "@types/debug": ^4.1.7 "@types/mocha": ^9.1.0 @@ -556,7 +556,7 @@ __metadata: languageName: node linkType: hard -"@randlabs/myalgo-connect@npm:^1.1.3": +"@randlabs/myalgo-connect@npm:^1.2.0": version: 1.2.0 resolution: "@randlabs/myalgo-connect@npm:1.2.0" dependencies: