Skip to content

fix(abstract-eth): follow up updates from PR 6882 #6890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 12, 2025
Merged

fix(abstract-eth): follow up updates from PR 6882 #6890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/abstract-eth/src/lib/transactionBuilder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ export abstract class TransactionBuilder extends BaseTransactionBuilder {
case TransactionType.FlushERC721:
this.setContract(transactionJson.to);
const erc721Data = decodeFlushERC721TokensData(transactionJson.data, transactionJson.to);
if (erc721Data.forwarderVersion >= 4) {
if (erc721Data.forwarderVersion === 4) {
this.forwarderVersion(erc721Data.forwarderVersion);
}
this.forwarderAddress(erc721Data.forwarderAddress);
Expand All @@ -258,7 +258,7 @@ export abstract class TransactionBuilder extends BaseTransactionBuilder {
case TransactionType.FlushERC1155:
this.setContract(transactionJson.to);
const erc1155Data = decodeFlushERC1155TokensData(transactionJson.data, transactionJson.to);
if (erc1155Data.forwarderVersion >= 4) {
if (erc1155Data.forwarderVersion === 4) {
this.forwarderVersion(erc1155Data.forwarderVersion);
}
this.forwarderAddress(erc1155Data.forwarderAddress);
Expand Down
6 changes: 2 additions & 4 deletions modules/abstract-eth/src/lib/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ export function decodeFlushERC721TokensData(
forwarderAddress: string;
tokenAddress: string;
tokenId: string;
forwarderVersion: number;
forwarderVersion?: number;
} {
if (data.startsWith(flushERC721ForwarderTokensMethodIdV4)) {
if (!to) {
Expand All @@ -284,7 +284,6 @@ export function decodeFlushERC721TokensData(
forwarderAddress: addHexPrefix(forwarderAddress as string),
tokenAddress: addHexPrefix(tokenAddress as string),
tokenId: new BigNumber(bufferToHex(tokenId as Buffer)).toFixed(),
forwarderVersion: 0,
};
}
throw new BuildTransactionError(`Invalid flush ERC721 bytecode: ${data}`);
Expand Down Expand Up @@ -332,7 +331,7 @@ export function decodeFlushERC1155TokensData(
forwarderAddress: string;
tokenAddress: string;
tokenId: string;
forwarderVersion: number;
forwarderVersion?: number;
} {
if (data.startsWith(flushERC1155ForwarderTokensMethodIdV4)) {
if (!to) {
Expand All @@ -357,7 +356,6 @@ export function decodeFlushERC1155TokensData(
forwarderAddress: addHexPrefix(forwarderAddress as string),
tokenAddress: addHexPrefix(tokenAddress as string),
tokenId: new BigNumber(bufferToHex(tokenId as Buffer)).toFixed(),
forwarderVersion: 0,
};
}
throw new BuildTransactionError(`Invalid flush ERC1155 bytecode: ${data}`);
Expand Down
14 changes: 8 additions & 6 deletions modules/abstract-eth/test/unit/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ describe('Abstract ETH Utils', () => {
const forwarderAddress = '0x8f977e912ef500548a0c3be6ddde9899f1199b81';
const tokenAddress = '0xdf7decb1baa8f529f0c8982cbb4be50357195299';
const tokenId = '12345';
const forwarderVersion = 0;
const forwarderVersion = 2;

const encoded = flushERC721TokensData(forwarderAddress, tokenAddress, tokenId, forwarderVersion);
const decoded = decodeFlushERC721TokensData(encoded);
Expand All @@ -48,7 +48,7 @@ describe('Abstract ETH Utils', () => {
decoded.forwarderAddress.toLowerCase().should.equal(forwarderAddress.toLowerCase());
decoded.tokenAddress.toLowerCase().should.equal(tokenAddress.toLowerCase());
decoded.tokenId.should.equal(tokenId);
decoded.forwarderVersion.should.equal(0);
should.not.exist(decoded.forwarderVersion);
});

it('should decode flush ERC721 data correctly for v4+', () => {
Expand All @@ -64,7 +64,8 @@ describe('Abstract ETH Utils', () => {
decoded.forwarderAddress.toLowerCase().should.equal(forwarderAddress.toLowerCase());
decoded.tokenAddress.toLowerCase().should.equal(tokenAddress.toLowerCase());
decoded.tokenId.should.equal(tokenId);
decoded.forwarderVersion.should.equal(4);
should.exist(decoded.forwarderVersion);
should.equal(decoded.forwarderVersion, 4);
});

it('should handle large token IDs for ERC721', () => {
Expand Down Expand Up @@ -133,7 +134,7 @@ describe('Abstract ETH Utils', () => {
const forwarderAddress = '0x8f977e912ef500548a0c3be6ddde9899f1199b81';
const tokenAddress = '0xdf7decb1baa8f529f0c8982cbb4be50357195299';
const tokenId = '99999';
const forwarderVersion = 0;
const forwarderVersion = 2;

const encoded = flushERC1155TokensData(forwarderAddress, tokenAddress, tokenId, forwarderVersion);
const decoded = decodeFlushERC1155TokensData(encoded);
Expand All @@ -142,7 +143,7 @@ describe('Abstract ETH Utils', () => {
decoded.forwarderAddress.toLowerCase().should.equal(forwarderAddress.toLowerCase());
decoded.tokenAddress.toLowerCase().should.equal(tokenAddress.toLowerCase());
decoded.tokenId.should.equal(tokenId);
decoded.forwarderVersion.should.equal(0);
should.not.exist(decoded.forwarderVersion);
});

it('should decode flush ERC1155 data correctly for v4+', () => {
Expand All @@ -158,7 +159,8 @@ describe('Abstract ETH Utils', () => {
decoded.forwarderAddress.toLowerCase().should.equal(forwarderAddress.toLowerCase());
decoded.tokenAddress.toLowerCase().should.equal(tokenAddress.toLowerCase());
decoded.tokenId.should.equal(tokenId);
decoded.forwarderVersion.should.equal(4);
should.exist(decoded.forwarderVersion);
should.equal(decoded.forwarderVersion, 4);
});

it('should handle token ID 0 for ERC1155', () => {
Expand Down
2 changes: 0 additions & 2 deletions modules/sdk-coin-eth/test/resources/eth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { Networks } from '@bitgo/statics';
import { EIP1559TxData, ETHTransactionType, KeyPair, LegacyTxData } from '../../src';

export const COIN = 'hteth';

export const TX_JSON =
'{"gasLimit":"1000","gasPrice":"10","nonce":1,"chainId":31,"value":"100000","data":"0x60606040526000600160006101000a81548160ff021916908315150217905550341561002a57600080fd5b60405161155b38038061155b833981016040528080518201919050506003815114151561005657600080fd5b806000908051906020019061006c929190610073565b5050610140565b8280548282559060005260206000209081019282156100ec579160200282015b828111156100eb5782518260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555091602001919060010190610093565b5b5090506100f991906100fd565b5090565b61013d91905b8082111561013957600081816101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905550600101610103565b5090565b90565b61140c8061014f6000396000f300606060405260043610610099576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630dcd7a6c146101335780632079fb9a146101e95780632da034091461024c57806339125215146102a45780637df73e271461037e578063a0b7967b146103cf578063a68a76cc146103f8578063abe3219c1461044d578063fc0f392d1461047a575b6000341115610131577f6e89d517057028190560dd200cf6bf792842861353d1173761dfa362e1c133f03334600036604051808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200184815260200180602001828103825284848281815260200192508082843782019150509550505050505060405180910390a15b005b341561013e57600080fd5b6101e7600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190803590602001909190803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509190505061048f565b005b34156101f457600080fd5b61020a6004808035906020019091905050610668565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561025757600080fd5b6102a2600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919050506106a7565b005b34156102af57600080fd5b61037c600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509190803590602001909190803590602001909190803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843782019150505050505091905050610773565b005b341561038957600080fd5b6103b5600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610a72565b604051808215151515815260200191505060405180910390f35b34156103da57600080fd5b6103e2610b16565b6040518082815260200191505060405180910390f35b341561040357600080fd5b61040b610b70565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561045857600080fd5b610460610b95565b604051808215151515815260200191505060405180910390f35b341561048557600080fd5b61048d610ba8565b005b60008061049b33610a72565b15156104a657600080fd5b878787878760405180807f45524332300000000000000000000000000000000000000000000000000000008152506005018673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018581526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c0100000000000000000000000002815260140183815260200182815260200195505050505050604051809103902091506105898883858888610c3b565b508590508073ffffffffffffffffffffffffffffffffffffffff1663a9059cbb89896000604051602001526040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b151561063857600080fd5b6102c65a03f1151561064957600080fd5b50505060405180519050151561065e57600080fd5b5050505050505050565b60008181548110151561067757fe5b90600052602060002090016000915054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60006106b233610a72565b15156106bd57600080fd5b8290508073ffffffffffffffffffffffffffffffffffffffff16633ef13367836040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b151561075a57600080fd5b6102c65a03f1151561076b57600080fd5b505050505050565b60008061077f33610a72565b151561078a57600080fd5b878787878760405180807f45544845520000000000000000000000000000000000000000000000000000008152506005018673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c0100000000000000000000000002815260140185815260200184805190602001908083835b602083101515610833578051825260208201915060208101905060208303925061080e565b6001836020036101000a038019825116818451168082178552505050505050905001838152602001828152602001955050505050506040518091039020915061087f8883858888610c3b565b90508773ffffffffffffffffffffffffffffffffffffffff16878760405180828051906020019080838360005b838110156108c75780820151818401526020810190506108ac565b50505050905090810190601f1680156108f45780820380516001836020036101000a031916815260200191505b5091505060006040518083038185876187965a03f192505050151561091857600080fd5b7f59bed9ab5d78073465dd642a9e3e76dfdb7d53bcae9d09df7d0b8f5234d5a8063382848b8b8b604051808773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200185600019166000191681526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200183815260200180602001828103825283818151815260200191508051906020019080838360005b83811015610a29578082015181840152602081019050610a0e565b50505050905090810190601f168015610a565780820380516001836020036101000a031916815260200191505b5097505050505050505060405180910390a15050505050505050565b600080600090505b600080549050811015610b0b578273ffffffffffffffffffffffffffffffffffffffff16600082815481101515610aad57fe5b906000526020600020900160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161415610afe5760019150610b10565b8080600101915050610a7a565b600091505b50919050565b6000806000809150600090505b600a811015610b655781600282600a81101515610b3c57fe5b01541115610b5857600281600a81101515610b5357fe5b015491505b8080600101915050610b23565b600182019250505090565b6000610b7a610e90565b604051809103906000f0801515610b9057600080fd5b905090565b600160009054906101000a900460ff1681565b610bb133610a72565b1515610bbc57600080fd5b60018060006101000a81548160ff0219169083151502179055507f0909e8f76a4fd3e970f2eaef56c0ee6dfaf8b87c5b8d3f56ffce78e825a9115733604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390a1565b600080610c488686610ce6565b9050600160009054906101000a900460ff168015610c6c5750610c6a87610a72565b155b15610c7657600080fd5b42841015610c8357600080fd5b610c8c83610db9565b610c9581610a72565b1515610ca057600080fd5b3373ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415610cd957600080fd5b8091505095945050505050565b60008060008060418551141515610cfc57600080fd5b602085015192506040850151915060ff6041860151169050601b8160ff161015610d2757601b810190505b600186828585604051600081526020016040526000604051602001526040518085600019166000191681526020018460ff1660ff16815260200183600019166000191681526020018260001916600019168152602001945050505050602060405160208103908084039060008661646e5a03f11515610da557600080fd5b505060206040510351935050505092915050565b600080610dc533610a72565b1515610dd057600080fd5b60009150600090505b600a811015610e385782600282600a81101515610df257fe5b01541415610dff57600080fd5b600282600a81101515610e0e57fe5b0154600282600a81101515610e1f57fe5b01541015610e2b578091505b8080600101915050610dd9565b600282600a81101515610e4757fe5b0154831015610e5557600080fd5b612710600283600a81101515610e6757fe5b015401831115610e7657600080fd5b82600283600a81101515610e8657fe5b0181905550505050565b60405161054080610ea18339019056006060604052341561000f57600080fd5b336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506104e28061005e6000396000f300606060405260043610610056576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168062821de3146101475780633ef133671461019c5780636b9f96ea146101d5575b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc349081150290604051600060405180830381858888f1935050505015156100b757600080fd5b7f69b31548dea9b3b707b4dff357d326e3e9348b24e7a6080a218a6edeeec48f9b3334600036604051808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200184815260200180602001828103825284848281815260200192508082843782019150509550505050505060405180910390a1005b341561015257600080fd5b61015a6101ea565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156101a757600080fd5b6101d3600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190505061020f565b005b34156101e057600080fd5b6101e861043c565b005b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008060008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561026f57600080fd5b8392503091508273ffffffffffffffffffffffffffffffffffffffff166370a08231836000604051602001526040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050602060405180830381600087803b151561031857600080fd5b6102c65a03f1151561032957600080fd5b505050604051805190509050600081141561034357610436565b8273ffffffffffffffffffffffffffffffffffffffff1663a9059cbb6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff16836000604051602001526040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b151561040f57600080fd5b6102c65a03f1151561042057600080fd5b50505060405180519050151561043557600080fd5b5b50505050565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc3073ffffffffffffffffffffffffffffffffffffffff16319081150290604051600060405180830381858888f1935050505015156104b457600080fd5b5600a165627a7a72305820088cce905e424bfe474510efe41761893e9e34b54b885b8fee546d8be88aee3c0029a165627a7a72305820827adc3ef3a179757bc33003e41070fbbfcdfc5db31275af3cb0395155cd3bbb002900000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000003000000000000000000000000386fe4e3d2b6acce93cc13d06e92b00aa50f429c0000000000000000000000007325a3f7d4f9e86ae62cf742426078c3755730d5000000000000000000000000603e077acd3f01e81b95fb92ce42ff60dff3d4c7"}';

Expand Down