From 14a0272c3ce23dca2ec056459a1429799604cfd7 Mon Sep 17 00:00:00 2001 From: cgewecke Date: Thu, 14 May 2020 12:49:49 -0700 Subject: [PATCH 1/3] Add optional connected property to AbstractProvider type --- packages/web3-core/types/index.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/web3-core/types/index.d.ts b/packages/web3-core/types/index.d.ts index 2ac876a8335..a6a3d39d80a 100644 --- a/packages/web3-core/types/index.d.ts +++ b/packages/web3-core/types/index.d.ts @@ -420,6 +420,7 @@ export interface AbstractProvider { sendAsync(payload: JsonRpcPayload, callback: (error: Error | null, result?: JsonRpcResponse) => void): void; send?(payload: JsonRpcPayload, callback: (error: Error | null, result?: JsonRpcResponse) => void): void; request?(args: RequestArguments): Promise; + connected?: boolean; } export type provider = From 7d27f5021e68c3d0a68ad6a0f9901e88d931cfdc Mon Sep 17 00:00:00 2001 From: cgewecke Date: Thu, 14 May 2020 13:24:09 -0700 Subject: [PATCH 2/3] Revert contract.method TS definition change (PR #3454) --- packages/web3-eth-contract/types/index.d.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/web3-eth-contract/types/index.d.ts b/packages/web3-eth-contract/types/index.d.ts index b922a7f13a9..f00102219d1 100644 --- a/packages/web3-eth-contract/types/index.d.ts +++ b/packages/web3-eth-contract/types/index.d.ts @@ -46,9 +46,7 @@ export class Contract { deploy(options: DeployOptions): ContractSendMethod; - methods: { - [key: string]: ContractSendMethod; - }; + methods: any; once( event: string, From 7911e5d7eab66d264862645b75d8ec3e21c535b1 Mon Sep 17 00:00:00 2001 From: cgewecke Date: Thu, 14 May 2020 13:35:39 -0700 Subject: [PATCH 3/3] Apply geth 1.9.13 CI fix to release branch --- scripts/e2e.geth.automine.sh | 2 +- scripts/e2e.geth.instamine.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/e2e.geth.automine.sh b/scripts/e2e.geth.automine.sh index 0282d15d4e7..7e9a3c0c87f 100755 --- a/scripts/e2e.geth.automine.sh +++ b/scripts/e2e.geth.automine.sh @@ -24,7 +24,7 @@ echo " " # Launch client w/ two unlocked accounts. # + accounts[0] default geth unlocked bal = ~infinity # + accounts[1] unlocked, signing password = 'left-hand-of-darkness' -geth-dev-assistant --period 2 --accounts 1 --tag 'stable' +geth-dev-assistant --period 2 --accounts 1 --tag 'v1.9.13' # Test GETH_AUTOMINE=true nyc --no-clean --silent _mocha -- \ diff --git a/scripts/e2e.geth.instamine.sh b/scripts/e2e.geth.instamine.sh index df4f7d048ba..d1f12a96d93 100755 --- a/scripts/e2e.geth.instamine.sh +++ b/scripts/e2e.geth.instamine.sh @@ -24,7 +24,7 @@ echo " " # Launch client w/ two unlocked accounts. # + accounts[0] default geth unlocked bal = ~infinity # + accounts[1] unlocked, bal=50 eth, signing password = 'left-hand-of-darkness' -geth-dev-assistant --accounts 1 --tag 'stable' +geth-dev-assistant --accounts 1 --tag 'v1.9.13' # Test GETH_INSTAMINE=true nyc --no-clean --silent _mocha -- \