Merge pull request #197 from JoinColony/fix/wait-for-deployment-tx

Wait for TX receipt in token deployment
JoinColony · Jun 19, 2018 · 262c340 · 262c340
2 parents ab6a1cf + 608d91f
commit 262c340
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## v.NEXT
 
+**Bug fixes**
+
+* Actually wait for transaction receipt in Token contract deployment. This fixes issues with real-life environments like testnets or mainnet (`@colony/colony-js-client`)
 
 ## v1.5.0
 

diff --git a/packages/colony-js-client/src/ColonyNetworkClient/index.js b/packages/colony-js-client/src/ColonyNetworkClient/index.js
@@ -242,6 +242,10 @@ export default class ColonyNetworkClient extends ContractClient {
  [utf8ToHex(name), utf8ToHex(symbol), decimals],
  );
  const { hash } = await this.adapter.wallet.sendTransaction(transaction);
+ const receipt = await this.adapter.getTransactionReceipt(hash);
+ if (receipt != null) return receipt.contractAddress;
+
+ await this.adapter.waitForTransaction(hash);
  const { contractAddress } = await this.adapter.getTransactionReceipt(hash);
  return contractAddress;
  }