Skip to content
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
4 changes: 2 additions & 2 deletions modules/bitgo/test/v2/unit/wallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -820,8 +820,8 @@ describe('V2 Wallet:', function () {
// @ts-expect-error checking type mismatch
await wallet.createAddress({ allowSkipVerifyAddress: null }).should.be.rejectedWith(message);

message = 'forwarderVersion has to be an integer 0, 1, 2, 3 or 4';
await wallet.createAddress({ forwarderVersion: 5 }).should.be.rejectedWith(message);
message = 'forwarderVersion has to be an integer 0, 1, 2, 3, 4 or 5';
await wallet.createAddress({ forwarderVersion: 6 }).should.be.rejectedWith(message);
await wallet.createAddress({ forwarderVersion: -1 }).should.be.rejectedWith(message);
});

Expand Down
9 changes: 8 additions & 1 deletion modules/express/src/typedRoutes/schemas/address.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
import * as t from 'io-ts';

export const ForwarderVersion = t.union([t.literal(0), t.literal(1), t.literal(2), t.literal(3), t.literal(4)]);
export const ForwarderVersion = t.union([
t.literal(0),
t.literal(1),
t.literal(2),
t.literal(3),
t.literal(4),
t.literal(5),
]);

export const EIP1559 = t.type({
maxFeePerGas: t.number,
Expand Down
4 changes: 2 additions & 2 deletions modules/express/test/unit/typedRoutes/createAddress.ts
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ describe('CreateAddress codec tests', function () {
});

it('should validate body with all forwarder version values', function () {
const forwarderVersions = [0, 1, 2, 3, 4];
const forwarderVersions = [0, 1, 2, 3, 4, 5];

forwarderVersions.forEach((version) => {
const validBody = {
Expand All @@ -289,7 +289,7 @@ describe('CreateAddress codec tests', function () {

it('should reject body with invalid forwarder version', function () {
const invalidBody = {
forwarderVersion: 5, // not in union [0,1,2,3,4]
forwarderVersion: 6, // not in union [0,1,2,3,4,5]
};

assert.throws(() => {
Expand Down
4 changes: 2 additions & 2 deletions modules/sdk-core/src/bitgo/wallet/wallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1290,8 +1290,8 @@ export class Wallet implements IWallet {
}

if (!_.isUndefined(forwarderVersion)) {
if (!_.isInteger(forwarderVersion) || forwarderVersion < 0 || forwarderVersion > 4) {
throw new Error('forwarderVersion has to be an integer 0, 1, 2, 3 or 4');
if (!_.isInteger(forwarderVersion) || forwarderVersion < 0 || forwarderVersion > 5) {
throw new Error('forwarderVersion has to be an integer 0, 1, 2, 3, 4 or 5');
}
addressParams.forwarderVersion = forwarderVersion;
}
Expand Down