Skip to content
Open
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
24 changes: 6 additions & 18 deletions modules/account-lib/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -333,30 +333,18 @@ const coinBuilderMap = {
};

const coinMessageBuilderFactoryMap = {
eth: Eth.MessageBuilderFactory,
hteth: Eth.MessageBuilderFactory,
bsc: Bsc.MessageBuilderFactory,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bsc to be removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bsc.MessageBuilderFactory and Eth.MessageBuilderFactory are the exact same class: both are re-exports of MessageBuilderFactory from @bitgo/abstract-eth

tbsc: Bsc.MessageBuilderFactory,
ada: Ada.MessageBuilderFactory,
tada: Ada.MessageBuilderFactory,
sol: Sol.MessageBuilderFactory,
tsol: Sol.MessageBuilderFactory,
arbeth: Eth.MessageBuilderFactory,
tarbeth: Eth.MessageBuilderFactory,
opeth: Eth.MessageBuilderFactory,
topeth: Eth.MessageBuilderFactory,
baseeth: Eth.MessageBuilderFactory,
tbaseeth: Eth.MessageBuilderFactory,
polygon: Eth.MessageBuilderFactory,
tpolygon: Eth.MessageBuilderFactory,
seievm: Eth.MessageBuilderFactory,
tseievm: Eth.MessageBuilderFactory,
flr: Eth.MessageBuilderFactory,
tflr: Eth.MessageBuilderFactory,
mon: Eth.MessageBuilderFactory,
tmon: Eth.MessageBuilderFactory,
};

coins
.filter((coin) => coin.features.includes(CoinFeature.SHARED_EVM_MESSAGE_SIGNING) && !coin.isToken)
.forEach((coin) => {
coinMessageBuilderFactoryMap[coin.name] = Eth.MessageBuilderFactory;
});

coins
.filter((coin) => coin.features.includes(CoinFeature.SHARED_EVM_SDK))
.forEach((coin) => {
Expand Down
36 changes: 35 additions & 1 deletion modules/account-lib/test/unit/messageFactory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import should from 'should';
import sinon from 'sinon';
import { getMessageBuilderFactory, registerMessageBuilderFactory } from '../../src';
import { BaseMessageBuilderFactory, BuildMessageError } from '@bitgo/sdk-core';
import { coins, BaseCoin } from '@bitgo/statics';
import { coins, BaseCoin, CoinFeature } from '@bitgo/statics';
import { MockMessageBuilderFactory } from './fixtures';

describe('Message Builder Factory', () => {
Expand All @@ -30,6 +30,40 @@ describe('Message Builder Factory', () => {
should.exist(htethFactory);
htethFactory.should.be.instanceof(BaseMessageBuilderFactory);
});

it('should auto-register all non-token coins with SHARED_EVM_MESSAGE_SIGNING feature', () => {
const evmCoins = coins.reduce<string[]>((acc, coin) => {
if (coin.features.includes(CoinFeature.SHARED_EVM_MESSAGE_SIGNING) && !coin.isToken) {
acc.push(coin.name);
}
return acc;
}, []);
evmCoins.length.should.be.greaterThan(0);

for (const coinName of evmCoins) {
const factory = getMessageBuilderFactory(coinName);
should.exist(factory, `Expected message builder factory for ${coinName}`);
factory.should.be.instanceof(BaseMessageBuilderFactory);
}
});

it('should not register token coins with SHARED_EVM_MESSAGE_SIGNING feature', () => {
const evmTokens = coins.reduce<string[]>((acc, coin) => {
if (coin.features.includes(CoinFeature.SHARED_EVM_MESSAGE_SIGNING) && coin.isToken) {
acc.push(coin.name);
}
return acc;
}, []);
evmTokens.length.should.be.greaterThan(0);

for (const tokenName of evmTokens) {
assert.throws(
() => getMessageBuilderFactory(tokenName),
(e: Error) => e instanceof BuildMessageError,
`Token ${tokenName} should not have a message builder factory`,
);
}
});
});

describe('registerMessageBuilderFactory', () => {
Expand Down