ARCHIVE/xahau.js
1
0
Fork 0
mirror of https://github.com/Xahau/xahau.js.git synced 2025-11-20 12:15:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Signer fixes (#1604)

Browse Source 
* Factor out reused wallet generation
* Remove extraneous types
* Clarify that multisign takes signed transactions

Co-authored-by: Mayukha Vadari <mvadari@ripple.com>
This commit is contained in:
Jackson Mills
2021-09-09 09:34:25 -07:00
committed by Mayukha Vadari
parent c401f703c7
commit eb56eb181a
2 changed files with 20 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/wallet/signer.ts
View File

@@ -32,10 +32,10 @@ function sign(wallet: Wallet, tx: Transaction, forMultisign = false): string {
}
/**
* Takes several transactions (in object or blob form) and creates a single transaction with all Signers
* that then gets signed and returned.
* Takes several transactions with Signer fields (in object or blob form) and creates a
* single transaction with all Signers that then gets signed and returned.
*
* @param transactions - An array of Transactions (in object or blob form) to combine and sign.
* @param transactions - An array of signed Transactions (in object or blob form) to combine into a single signed Transaction.
* @returns A single signed Transaction which has all Signers from transactions within it.
* @throws ValidationError if:
* - There were no transactions given to sign

48
test/wallet/signer.ts
View File

@@ -18,6 +18,8 @@ const privateKey =
'00141BA006D3363D2FB2785E8DF4E44D3A49908780CB4FB51F6D217C08C021429F'
const address = 'rhvh5SrgBL5V8oeV9EpDuVszeJSSCEkbPc'
const seed = 'ss1x3KLrSvfg7irFc1D929WXZ7z9H'
const wallet = Wallet.fromSeed(seed)
const verifyWallet = new Wallet(publicKey, privateKey)
const tx: Transaction = {
TransactionType: 'Payment',
@@ -169,44 +171,36 @@ describe('Signer', function () {
const signedTxBlob =
'120000228000000024013A0F74201B013A0FC36140000000014FB18068400000000000000C732102A8A44DB3D4C73EEEE11DFE54D2029103B776AA8A8D293A91D645977C9DF5F544744730450221009ECB5324717E14DD6970126271F05BC2626D2A8FA9F3797555D417F8257C1E6002206BDD74A0F30425F2BA9DB69C90F21B3E27735C190FB4F3A640F066ACBBF06AD98114B3263BD0A9BF9DFDBBBBD07F536355FF477BF0E98314F667B0CA50CC7709A220B0561B85E53A48461FA8'
const wallet = Wallet.fromSeed(seed)
const signedTx: string = sign(wallet, tx3)
assert.equal(signedTx, signedTxBlob)
})
it('sign in multisign format', function () {
const wallet = Wallet.fromSeed(unsignedSecret1)
const multisignWallet = Wallet.fromSeed(unsignedSecret1)
assert.deepEqual(
decode(sign(wallet, unsignedTx1, true)),
decode(sign(multisignWallet, unsignedTx1, true)),
multisignTx1 as unknown as JsonObject,
)
})
it('multisign runs successfully with Transaction objects', function () {
const transactions: Transaction[] = [
multisignTxToCombine1,
multisignTxToCombine2,
]
const transactions = [multisignTxToCombine1, multisignTxToCombine2]
assert.deepEqual(multisign(transactions), expectedMultisign)
})
it('multisign runs successfully with tx_blobs', function () {
const transactions: Transaction[] = [
multisignTxToCombine1,
multisignTxToCombine2,
]
const transactions = [multisignTxToCombine1, multisignTxToCombine2]
const encodedTransactions: string[] = transactions.map(encode)
const encodedTransactions = transactions.map(encode)
assert.deepEqual(multisign(encodedTransactions), expectedMultisign)
})
it('multisign throws a validation error when there are no transactions', function () {
const transactions: Transaction[] = []
const transactions = []
assert.throws(() => multisign(transactions), ValidationError)
})
@@ -232,10 +226,7 @@ describe('Signer', function () {
],
}
const transactions: Transaction[] = [
multisignTxToCombine1,
differentMultisignedTx,
]
const transactions = [multisignTxToCombine1, differentMultisignedTx]
assert.throws(() => multisign(transactions))
})
@@ -250,49 +241,44 @@ describe('Signer', function () {
})
it('authorizeChannel succeeds with secp256k1 seed', function () {
const wallet = Wallet.fromSeed('snGHNrPbHrdUcszeuDEigMdC1Lyyd')
const secpWallet = Wallet.fromSeed('snGHNrPbHrdUcszeuDEigMdC1Lyyd')
const channelId =
'5DB01B7FFED6B67E6B0414DED11E051D2EE2B7619CE0EAA6286D67A3A4D5BDB3'
const amount = '1000000'
assert.equal(
authorizeChannel(wallet, channelId, amount),
authorizeChannel(secpWallet, channelId, amount),
'304402204E7052F33DDAFAAA55C9F5B132A5E50EE95B2CF68C0902F61DFE77299BC893740220353640B951DCD24371C16868B3F91B78D38B6F3FD1E826413CDF891FA8250AAC',
)
})
it('authorizeChannel succeeds with ed25519 seed', function () {
const wallet = Wallet.fromSeed('sEdSuqBPSQaood2DmNYVkwWTn1oQTj2')
const edWallet = Wallet.fromSeed('sEdSuqBPSQaood2DmNYVkwWTn1oQTj2')
const channelId =
'5DB01B7FFED6B67E6B0414DED11E051D2EE2B7619CE0EAA6286D67A3A4D5BDB3'
const amount = '1000000'
assert.equal(
authorizeChannel(wallet, channelId, amount),
authorizeChannel(edWallet, channelId, amount),
'7E1C217A3E4B3C107B7A356E665088B4FBA6464C48C58267BEF64975E3375EA338AE22E6714E3F5E734AE33E6B97AAD59058E1E196C1F92346FC1498D0674404',
)
})
it('verifySignature succeeds for valid signed transaction blob', function () {
const wallet = new Wallet(publicKey, privateKey)
const signedTx: string = sign(wallet, tx)
const signedTx = sign(verifyWallet, tx)
assert.isTrue(verifySignature(signedTx))
})
it('verify succeeds for valid signed transaction object', function () {
const wallet = new Wallet(publicKey, privateKey)
const signedTx: string = sign(wallet, tx)
const signedTx = sign(verifyWallet, tx)
assert.isTrue(verifySignature(decode(signedTx) as unknown as Transaction))
})
it('verify throws for invalid signing key', function () {
const wallet = new Wallet(publicKey, privateKey)
const signedTx: string = sign(wallet, tx)
const signedTx = sign(verifyWallet, tx)
const decodedTx: Transaction = decode(signedTx) as unknown as Transaction
const decodedTx = decode(signedTx) as unknown as Transaction
// Use a different key for validation
decodedTx.SigningPubKey =