Skip to content
This repository has been archived by the owner on Feb 21, 2024. It is now read-only.

Add MetaMask/Infura workaround for pending transactions #265

Merged
merged 2 commits into from
Jul 22, 2019
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
30 changes: 29 additions & 1 deletion modules/node_modules/@colony/purser-core/defaults.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions modules/node_modules/@colony/purser-core/genericWallet.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 22 additions & 8 deletions modules/node_modules/@colony/purser-core/helpers.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions modules/node_modules/@colony/purser-ledger/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 37 additions & 1 deletion modules/node_modules/@colony/purser-metamask/staticMethods.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions modules/node_modules/@colony/purser-software/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions modules/node_modules/@colony/purser-trezor/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions modules/tests/purser-core/genericWallet.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
addressNormalizer,
hexSequenceNormalizer,
} from '@colony/purser-core/normalizers';
import { NETWORK_IDS } from '@colony/purser-core/defaults';
import { CHAIN_IDS } from '@colony/purser-core/defaults';

jest.dontMock('@colony/purser-core/genericWallet');

Expand Down Expand Up @@ -146,7 +146,7 @@ describe('`Core` Module', () => {
/*
* Address
*/
expect(genericWallet).toHaveProperty('chainId', NETWORK_IDS.HOMESTEAD);
expect(genericWallet).toHaveProperty('chainId', CHAIN_IDS.HOMESTEAD);
});
test('Validates values used to instantiate', async () => {
/* eslint-disable-next-line no-new */
Expand Down
4 changes: 2 additions & 2 deletions modules/tests/purser-ledger/open.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
derivationPathSerializer,
userInputValidator,
} from '@colony/purser-core/helpers';
import { PATH, NETWORK_IDS } from '@colony/purser-core/defaults';
import { PATH, CHAIN_IDS } from '@colony/purser-core/defaults';
import * as utils from '@colony/purser-core/utils';

import {
Expand Down Expand Up @@ -78,7 +78,7 @@ describe('Ledger` Hardware Wallet Module', () => {
);
});
test('Sets the derivation path coin to the mainnet type', async () => {
await ledgerWallet.open({ chainId: NETWORK_IDS.HOMESTEAD });
await ledgerWallet.open({ chainId: CHAIN_IDS.HOMESTEAD });
/*
* Should set the coin to the mainnet 60 type
*/
Expand Down
4 changes: 2 additions & 2 deletions modules/tests/purser-trezor/open.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
derivationPathSerializer,
userInputValidator,
} from '@colony/purser-core/helpers';
import { PATH, NETWORK_IDS } from '@colony/purser-core/defaults';
import { PATH, CHAIN_IDS } from '@colony/purser-core/defaults';

import * as utils from '@colony/purser-core/utils';

Expand Down Expand Up @@ -94,7 +94,7 @@ describe('Trezor` Hardware Wallet Module', () => {
);
});
test('Sets the derivation path coin to the mainnet type', async () => {
await trezorWallet.open({ chainId: NETWORK_IDS.HOMESTEAD });
await trezorWallet.open({ chainId: CHAIN_IDS.HOMESTEAD });
/*
* Should set the coin to the mainnet 60 type
*/
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
"@babel/runtime": "^7.1.2",
"@ledgerhq/hw-app-eth": "^4.68.1",
"@ledgerhq/hw-transport-u2f": "^4.68.0",
"await-transaction-mined": "^1.0.12",
"bip32-path": "^0.4.2",
"bn.js": "^5.0.0",
"ethereumjs-common": "^1.3.0",
Expand Down
5 changes: 5 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1085,6 +1085,11 @@ atob@^2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"

await-transaction-mined@^1.0.12:
version "1.0.12"
resolved "https://registry.yarnpkg.com/await-transaction-mined/-/await-transaction-mined-1.0.12.tgz#be7b3eed6ce01e5b28f6e0588d38e70eaf2c81f8"
integrity sha512-UZ84Bh0TUVnXa/ioleGutsFP1/k6WGVWuZP2W1uWCbrcH6KwQmu3ZSq0gvKibsNrG7RSB+0UxnjDvzT2otkpoQ==

aws-sign2@~0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
Expand Down