Skip to content

Commit 5c473ab

Browse files
at31416at31416
authored
Merge pull request #6485 from BitGo/coin-4885
fix(sdk-coin-vet): make nonce field string type
2 parents b8656b3 + 31e3a21 commit 5c473ab

8 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎modules/sdk-coin-vet/src/lib/iface.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export interface VetTransactionData {
1515
gasPriceCoef: number;
1616
gas: number;
1717
dependsOn: string | null;
18-
nonce: number;
18+
nonce: string;
1919
sender?: string;
2020
feePayer?: string;
2121
recipients?: TransactionRecipient[];

‎modules/sdk-coin-vet/src/lib/transaction/addressInitializationTransaction.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ export class AddressInitializationTransaction extends Transaction {
134134
this.gasPriceCoef = typeof body.gasPriceCoef === 'number' ? body.gasPriceCoef : 128;
135135
this.gas = typeof body.gas === 'number' ? body.gas : Number(body.gas) || 0;
136136
this.dependsOn = body.dependsOn || null;
137-
this.nonce = typeof body.nonce === 'number' ? body.nonce : Number(body.nonce) || 0;
137+
this.nonce = String(body.nonce);
138138
// Set data from clauses
139139
this.contract = body.clauses[0]?.to || '0x0';
140140
this.transactionData = body.clauses[0]?.data || '0x0';

‎modules/sdk-coin-vet/src/lib/transaction/flushTokenTransaction.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export class FlushTokenTransaction extends Transaction {
8181
this.gasPriceCoef = typeof body.gasPriceCoef === 'number' ? body.gasPriceCoef : 128;
8282
this.gas = typeof body.gas === 'number' ? body.gas : Number(body.gas) || 0;
8383
this.dependsOn = body.dependsOn || null;
84-
this.nonce = typeof body.nonce === 'number' ? body.nonce : Number(body.nonce) || 0;
84+
this.nonce = String(body.nonce);
8585
// Set data from clauses
8686
this.contract = body.clauses[0]?.to || '0x0';
8787
this.transactionData = body.clauses[0]?.data || '0x0';

‎modules/sdk-coin-vet/src/lib/transaction/transaction.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export class Transaction extends BaseTransaction {
2727
private _gasPriceCoef: number;
2828
private _gas: number;
2929
private _dependsOn: string | null;
30-
private _nonce: number;
30+
private _nonce: string;
3131
private _sender: string;
3232
private _senderSignature: Buffer | null;
3333
private _feePayerAddress: string;
@@ -43,7 +43,7 @@ export class Transaction extends BaseTransaction {
4343
this._gasPriceCoef = 128;
4444
this._gas = 0;
4545
this._dependsOn = null;
46-
this._nonce = 0x0;
46+
this._nonce = String(0);
4747
this._recipients = [];
4848
this._senderSignature = null;
4949
this._feePayerSignature = null;
@@ -174,11 +174,11 @@ export class Transaction extends BaseTransaction {
174174
this._dependsOn = dep;
175175
}
176176

177-
get nonce(): number {
177+
get nonce(): string {
178178
return this._nonce;
179179
}
180180

181-
set nonce(n: number) {
181+
set nonce(n: string) {
182182
this._nonce = n;
183183
}
184184

@@ -278,7 +278,7 @@ export class Transaction extends BaseTransaction {
278278
this.gasPriceCoef = typeof body.gasPriceCoef === 'number' ? body.gasPriceCoef : 128;
279279
this.gas = typeof body.gas === 'number' ? body.gas : Number(body.gas) || 0;
280280
this.dependsOn = body.dependsOn || null;
281-
this.nonce = typeof body.nonce === 'number' ? body.nonce : Number(body.nonce) || 0;
281+
this.nonce = String(body.nonce);
282282
// Set recipients from clauses
283283
this.recipients = body.clauses.map((clause) => ({
284284
address: (clause.to || '0x0').toString().toLowerCase(),

‎modules/sdk-coin-vet/src/lib/transactionBuilder/transactionBuilder.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export abstract class TransactionBuilder extends BaseTransactionBuilder {
2222

2323
protected abstract get transactionType(): TransactionType;
2424

25-
getNonce(): number {
25+
getNonce(): string {
2626
return this.transaction.nonce;
2727
}
2828

@@ -72,7 +72,7 @@ export abstract class TransactionBuilder extends BaseTransactionBuilder {
7272
return this;
7373
}
7474

75-
nonce(n: number): this {
75+
nonce(n: string): this {
7676
this.transaction.nonce = n;
7777
return this;
7878
}

‎modules/sdk-coin-vet/test/transactionBuilder/addressInitializationBuilder.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ describe('Address Initialisation Transaction', () => {
1313
const transaction = new AddressInitializationTransaction(coins.get('tvet'));
1414
const txBuilder = factory.getAddressInitializationBuilder(transaction);
1515
txBuilder.gas(21000);
16-
txBuilder.nonce(64248);
16+
txBuilder.nonce('64248');
1717
txBuilder.blockRef('0x014ead140e77bbc1');
1818
txBuilder.expiration(64);
1919
txBuilder.gasPriceCoef(128);
@@ -24,7 +24,7 @@ describe('Address Initialisation Transaction', () => {
2424
txBuilder.salt(testData.SALT);
2525
const tx = (await txBuilder.build()) as AddressInitializationTransaction;
2626
should.equal(tx.gas, 21000);
27-
should.equal(tx.nonce, 64248);
27+
should.equal(tx.nonce, '64248');
2828
should.equal(tx.expiration, 64);
2929
should.equal(tx.type, TransactionType.AddressInitialization);
3030
should.equal(tx.blockRef, '0x014ead140e77bbc1');
@@ -42,7 +42,7 @@ describe('Address Initialisation Transaction', () => {
4242
const transaction = new AddressInitializationTransaction(coins.get('tvet'));
4343
const txBuilder = factory.getAddressInitializationBuilder(transaction);
4444
txBuilder.gas(21000);
45-
txBuilder.nonce(64248);
45+
txBuilder.nonce('64248');
4646
txBuilder.blockRef('0x014ead140e77bbc1');
4747
txBuilder.addFeePayerAddress(testData.feePayer.address);
4848
txBuilder.expiration(64);
@@ -61,7 +61,7 @@ describe('Address Initialisation Transaction', () => {
6161
const transaction = new AddressInitializationTransaction(coins.get('tvet'));
6262
const txBuilder = factory.getAddressInitializationBuilder(transaction);
6363
txBuilder.gas(21000);
64-
txBuilder.nonce(64248);
64+
txBuilder.nonce('64248');
6565
txBuilder.blockRef('0x014ead140e77bbc1');
6666
txBuilder.addFeePayerAddress(testData.feePayer.address);
6767
txBuilder.expiration(64);
@@ -74,7 +74,7 @@ describe('Address Initialisation Transaction', () => {
7474

7575
const tx = (await txBuilder.build()) as Transaction;
7676
const toJson = tx.toJson();
77-
should.equal(toJson.nonce, 64248);
77+
should.equal(toJson.nonce, '64248');
7878
should.equal(toJson.gas, 21000);
7979
should.equal(toJson.gasPriceCoef, 128);
8080
should.equal(toJson.expiration, 64);

‎modules/sdk-coin-vet/test/transactionBuilder/flushTokenTransactionBuilder.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ describe('Flush Token Transaction', () => {
1414
const transaction = new FlushTokenTransaction(coins.get('tvet'));
1515
const txBuilder = factory.getFlushTokenTransactionBuilder(transaction);
1616
txBuilder.gas(21000);
17-
txBuilder.nonce(64248);
17+
txBuilder.nonce('64248');
1818
txBuilder.blockRef('0x014ead140e77bbc1');
1919
txBuilder.expiration(64);
2020
txBuilder.gasPriceCoef(128);
@@ -23,7 +23,7 @@ describe('Flush Token Transaction', () => {
2323
txBuilder.forwarderVersion(4);
2424
const tx = (await txBuilder.build()) as FlushTokenTransaction;
2525
should.equal(tx.gas, 21000);
26-
should.equal(tx.nonce, 64248);
26+
should.equal(tx.nonce, '64248');
2727
should.equal(tx.expiration, 64);
2828
should.equal(tx.type, TransactionType.FlushTokens);
2929
should.equal(tx.blockRef, '0x014ead140e77bbc1');
@@ -40,7 +40,7 @@ describe('Flush Token Transaction', () => {
4040
const transaction = new FlushTokenTransaction(coins.get('tvet'));
4141
const txBuilder = factory.getFlushTokenTransactionBuilder(transaction);
4242
txBuilder.gas(21000);
43-
txBuilder.nonce(64248);
43+
txBuilder.nonce('64248');
4444
txBuilder.blockRef('0x014ead140e77bbc1');
4545
txBuilder.expiration(64);
4646
txBuilder.gasPriceCoef(128);
@@ -56,7 +56,7 @@ describe('Flush Token Transaction', () => {
5656
const transaction = new FlushTokenTransaction(coins.get('tvet'));
5757
const txBuilder = factory.getFlushTokenTransactionBuilder(transaction);
5858
txBuilder.gas(21000);
59-
txBuilder.nonce(64248);
59+
txBuilder.nonce('64248');
6060
txBuilder.blockRef('0x014ead140e77bbc1');
6161
txBuilder.expiration(64);
6262
txBuilder.gasPriceCoef(128);
@@ -66,7 +66,7 @@ describe('Flush Token Transaction', () => {
6666
const tx = (await txBuilder.build()) as FlushTokenTransaction;
6767

6868
const toJson = tx.toJson();
69-
should.equal(toJson.nonce, 64248);
69+
should.equal(toJson.nonce, '64248');
7070
should.equal(toJson.gas, 21000);
7171
should.equal(toJson.gasPriceCoef, 128);
7272
should.equal(toJson.expiration, 64);

‎modules/sdk-coin-vet/test/transactionBuilder/transferBuilder.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ describe('Vet Transfer Transaction', () => {
1515
txBuilder.sender(testData.addresses.validAddresses[0]);
1616
txBuilder.recipients(testData.recipients);
1717
txBuilder.gas(21000);
18-
txBuilder.nonce(64248);
18+
txBuilder.nonce('64248');
1919
txBuilder.blockRef('0x014ead140e77bbc1');
2020
txBuilder.addFeePayerAddress(testData.feePayer.address);
2121
txBuilder.expiration(64);
@@ -26,7 +26,7 @@ describe('Vet Transfer Transaction', () => {
2626
should.equal(tx.recipients[0].amount, testData.recipients[0].amount);
2727
should.equal(tx.gas, 21000);
2828
should.equal(tx.getFee(), '315411764705882352');
29-
should.equal(tx.nonce, 64248);
29+
should.equal(tx.nonce, '64248');
3030
should.equal(tx.expiration, 64);
3131
should.equal(tx.type, TransactionType.Send);
3232
tx.inputs.length.should.equal(1);
@@ -48,7 +48,7 @@ describe('Vet Transfer Transaction', () => {
4848

4949
it('should build and send a signed tx', async function () {
5050
const txBuilder = factory.from(testData.SPONSORED_TRANSACTION);
51-
txBuilder.getNonce().should.equal(186037);
51+
txBuilder.getNonce().should.equal('186037');
5252

5353
const tx = (await txBuilder.build()) as Transaction;
5454
should.equal(tx.type, TransactionType.Send);
@@ -81,7 +81,7 @@ describe('Vet Transfer Transaction', () => {
8181
txBuilder.sender(testData.addresses.validAddresses[0]);
8282
txBuilder.recipients(testData.recipients);
8383
txBuilder.gas(21000);
84-
txBuilder.nonce(64248);
84+
txBuilder.nonce('64248');
8585
txBuilder.expiration(64);
8686
txBuilder.blockRef('0x014ead140e77bbc1');
8787
txBuilder.gasPriceCoef(128);
@@ -100,7 +100,7 @@ describe('Vet Transfer Transaction', () => {
100100
txBuilder.sender(testData.addresses.validAddresses[0]);
101101
txBuilder.recipients(testData.recipients);
102102
txBuilder.gas(21000);
103-
txBuilder.nonce(64248);
103+
txBuilder.nonce('64248');
104104
txBuilder.expiration(64);
105105
txBuilder.blockRef('0x014ead140e77bbc1');
106106
txBuilder.gasPriceCoef(128);
@@ -114,7 +114,7 @@ describe('Vet Transfer Transaction', () => {
114114
amount: testData.recipients[0].amount,
115115
},
116116
]);
117-
should.equal(toJson.nonce, 64248);
117+
should.equal(toJson.nonce, '64248');
118118
should.equal(toJson.gas, 21000);
119119
should.equal(toJson.gasPriceCoef, 128);
120120
should.equal(toJson.expiration, 64);
@@ -133,7 +133,7 @@ describe('Vet Transfer Transaction', () => {
133133
amount: testData.AMOUNT.toString(),
134134
},
135135
]);
136-
should.equal(toJson.nonce, 186037);
136+
should.equal(toJson.nonce, '186037');
137137
should.equal(toJson.gas, 21000);
138138
should.equal(toJson.gasPriceCoef, 128);
139139
should.equal(toJson.expiration, 64);
@@ -145,7 +145,7 @@ describe('Vet Transfer Transaction', () => {
145145
txBuilder.sender(testData.addresses.validAddresses[2]);
146146
txBuilder.recipients(testData.recipients);
147147
txBuilder.gas(21000);
148-
txBuilder.nonce(64248);
148+
txBuilder.nonce('64248');
149149
txBuilder.blockRef('0x014ead140e77bbc1');
150150
txBuilder.addFeePayerAddress(testData.feePayer.address);
151151
txBuilder.expiration(64);

0 commit comments

Comments
 (0)