Skip to content

Commit

Permalink
Merge branch 'main' into feat/change-blockbook-url
Browse files Browse the repository at this point in the history
  • Loading branch information
@lucasgabrielgsp
lucasgabrielgsp authored Sep 10, 2024
2 parents 1a99ece + 5091992 commit 3cedd3a
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion packages/sysweb3-keyring/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pollum-io/sysweb3-keyring",
"version": "1.0.480",
"version": "1.0.481",
"description": "Keyring Manager for UTXO and Web3 Wallets",
"main": "cjs/index.js",
"types": "types/index.d.ts",
Expand Down
44 changes: 22 additions & 22 deletions packages/sysweb3-keyring/src/transactions/ethereum.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -653,13 +653,13 @@ export class EthereumTransactions implements IEthereumTransactions {
typeof formatParams.gasLimit === 'string'
? formatParams.gasLimit
: // @ts-ignore
`${params.gasLimit.toHexString()}`,
`${params.gasLimit.hex}`,
value:
typeof formatParams.value === 'string' ||
typeof formatParams.value === 'number'
? `${formatParams.value}`
: // @ts-ignore
`${params.value.toHexString()}`,
`${params.value.hex}`,
nonce: this.toBigNumber(transactionNonce)._hex,
chainId: activeNetwork.chainId,
};
Expand All @@ -671,23 +671,23 @@ export class EthereumTransactions implements IEthereumTransactions {
typeof formatParams.gasLimit === 'string'
? formatParams.gasLimit
: // @ts-ignore
`${params.gasLimit.toHexString()}`,
`${params.gasLimit.hex}`,
maxFeePerGas:
typeof formatParams.maxFeePerGas === 'string'
? formatParams.maxFeePerGas
: // @ts-ignore
`${params.maxFeePerGas.toHexString()}`,
`${params.maxFeePerGas.hex}`,
maxPriorityFeePerGas:
typeof formatParams.maxPriorityFeePerGas === 'string'
? formatParams.maxPriorityFeePerGas
: // @ts-ignore
`${params.maxPriorityFeePerGas.toHexString()}`,
`${params.maxPriorityFeePerGas.hex}`,
value:
typeof formatParams.value === 'string' ||
typeof formatParams.value === 'number'
? `${formatParams.value}`
: // @ts-ignore
`${params.value.toHexString()}`,
`${params.value.hex}`,
nonce: this.toBigNumber(transactionNonce)._hex,
chainId: activeNetwork.chainId,
};
Expand All @@ -699,23 +699,23 @@ export class EthereumTransactions implements IEthereumTransactions {
typeof formatParams.gasLimit === 'string'
? formatParams.gasLimit
: // @ts-ignore
`${params.gasLimit.toHexString()}`,
`${params.gasLimit.hex}`,
maxFeePerGas:
typeof formatParams.maxFeePerGas === 'string'
? formatParams.maxFeePerGas
: // @ts-ignore
`${params.maxFeePerGas.toHexString()}`,
`${params.maxFeePerGas.hex}`,
maxPriorityFeePerGas:
typeof formatParams.maxPriorityFeePerGas === 'string'
? formatParams.maxPriorityFeePerGas
: // @ts-ignore
`${params.maxPriorityFeePerGas.toHexString()}`,
`${params.maxPriorityFeePerGas.hex}`,
value:
typeof formatParams.value === 'string' ||
typeof formatParams.value === 'number'
? `${formatParams.value}`
: // @ts-ignore
`${params.value.toHexString()}`,
`${params.value.hex}`,
nonce: this.toBigNumber(transactionNonce)._hex,
chainId: activeNetwork.chainId,
};
Expand Down Expand Up @@ -1117,7 +1117,7 @@ export class EthereumTransactions implements IEthereumTransactions {
to: tokenAddress,
value: '0x0',
// @ts-ignore
gasLimit: `${gasLimit.toHexString()}`,
gasLimit: `${gasLimit.hex}`,
// @ts-ignore
gasPrice: `${gasPrice}`,
nonce: this.toBigNumber(transactionNonce)._hex,
Expand All @@ -1129,11 +1129,11 @@ export class EthereumTransactions implements IEthereumTransactions {
to: tokenAddress,
value: '0x0',
// @ts-ignore
gasLimit: `${gasLimit.toHexString()}`,
gasLimit: `${gasLimit.hex}`,
// @ts-ignore
maxFeePerGas: `${maxFeePerGas.toHexString()}`,
maxFeePerGas: `${maxFeePerGas.hex}`,
// @ts-ignore
maxPriorityFeePerGas: `${maxPriorityFeePerGas.toHexString()}`,
maxPriorityFeePerGas: `${maxPriorityFeePerGas.hex}`,
nonce: this.toBigNumber(transactionNonce)._hex,
chainId: activeNetwork.chainId,
data: txData,
Expand Down Expand Up @@ -1362,7 +1362,7 @@ export class EthereumTransactions implements IEthereumTransactions {
to: tokenAddress,
value: '0x0',
// @ts-ignore
gasLimit: `${gasLimit.toHexString()}`,
gasLimit: `${gasLimit.hex}`,
// @ts-ignore
gasPrice: `${gasPrice}`,
nonce: this.toBigNumber(transactionNonce)._hex,
Expand All @@ -1375,11 +1375,11 @@ export class EthereumTransactions implements IEthereumTransactions {
to: tokenAddress,
value: '0x0',
// @ts-ignore
gasLimit: `${gasLimit.toHexString()}`,
gasLimit: `${gasLimit.hex}`,
// @ts-ignore
maxFeePerGas: `${maxFeePerGas.toHexString()}`,
maxFeePerGas: `${maxFeePerGas.hex}`,
// @ts-ignore
maxPriorityFeePerGas: `${maxPriorityFeePerGas.toHexString()}`,
maxPriorityFeePerGas: `${maxPriorityFeePerGas.hex}`,
nonce: this.toBigNumber(transactionNonce)._hex,
chainId: activeNetwork.chainId,
data: txData,
Expand Down Expand Up @@ -1596,7 +1596,7 @@ export class EthereumTransactions implements IEthereumTransactions {
to: tokenAddress,
value: '0x0',
// @ts-ignore
gasLimit: `${gasLimit.toHexString()}`,
gasLimit: `${gasLimit.hex}`,
// @ts-ignore
gasPrice: `${gasPrice}`,
nonce: this.toBigNumber(transactionNonce)._hex,
Expand All @@ -1608,11 +1608,11 @@ export class EthereumTransactions implements IEthereumTransactions {
to: tokenAddress,
value: '0x0',
// @ts-ignore
gasLimit: `${gasLimit.toHexString()}`,
gasLimit: `${gasLimit.hex}`,
// @ts-ignore
maxFeePerGas: `${maxFeePerGas.toHexString()}`,
maxFeePerGas: `${maxFeePerGas.hex}`,
// @ts-ignore
maxPriorityFeePerGas: `${maxPriorityFeePerGas.toHexString()}`,
maxPriorityFeePerGas: `${maxPriorityFeePerGas.hex}`,
nonce: this.toBigNumber(transactionNonce)._hex,
chainId: activeNetwork.chainId,
data: txData,
Expand Down

0 comments on commit 3cedd3a

Please sign in to comment.