Make a deposit (contract code) #24

liamzebedee · 2019-08-01T18:13:07Z

Implements the Web3/contract side of creating a deposit using DepositFactory. Part of the client/ package.

Checks in the contract artifacts of tbtc.

Blockers: dApp integration blocked by #18

Refs: #12

nkuba

We should commit only the contracts artifacts that we use (TBTCSystem, TBTCToken, KeepBridge, DepositFactory, Deposit, did I miss something?). We don't need to add all the artifacts from tbtc

client/src/Deposit.js

nkuba · 2019-08-03T09:51:31Z

client/src/Deposit.js

 }

+


Just one empty line, please.

nkuba · 2019-08-03T09:52:55Z

client/src/FundingProof.js

+
+let electrumConfig
+
+export function setElectrumConfig(config) {


We will need to update this part after #21 is merged.

#21 is merged to master. Can you please merge master to this branch and see if the changes to this file are still necessary?

Yeah @nkuba will do 😄

nkuba · 2019-08-03T09:55:54Z

client/src/eth/copy-artifacts.sh

@@ -0,0 +1,7 @@
+#!/bin/sh


Do we need to commit this file?

I think it's good for reproducibility? Would we be able to find a better way to communicate what's happening?

For now, we will just commit artifacts manually as a workaround. And use the ones deployed to the internal testnet. We need to mention it in the readme and find a proper way later. I don't think we need to add this copy-artifacts.sh file, especially that it may not work due to a hardcoded path to different repo ../../../../tbtc/implementation/build/contracts/*

Well, perhaps we could still save some time by having a script, but passing in the path of where the contracts are as an argument. What do you think of that?

Ok, but we need to add big TODO as this is just for development and remove it as soon as we have a final solution for artifacts downloading.

nkuba · 2019-08-03T09:58:40Z

client/test/DepositTest.js

+        web3 = new Web3(new Web3.providers.HttpProvider('http://localhost:8545'));
+        await setDefaults(web3)
+
+        // setElectrumConfig({


Remove commented code.

client/test/DepositTest.js

nkuba · 2019-08-03T10:00:26Z

client/test/DepositTest.js

+
+        expect(await deposit.getCurrentState()).to.eq.BN('1')
+    })
+


Remove duplicated empty lines.

nkuba · 2019-08-03T10:04:12Z

package.json

@@ -10,6 +11,13 @@
        "lib/tbtc-helpers"
    ],
    "devDependencies": {
+        "bn-chai": "^1.0.1",


Shouldn't this all dependencies be added to client/package.json?

client/package.json

client/src/eth/contracts.js

nkuba · 2019-08-05T11:00:04Z

package.json

@@ -1,6 +1,7 @@
 {
    "name": "tbtc-dapp",
    "scripts": {
+        "install": "subpkg run install",


This won't work unless we define install script in each of the submodules.

➜ tbtc-dapp git:(put-down-small-bond) ✗ npm run install > tbtc-dapp@ install /Users/jakub/workspace/tbtc-dapp > subpkg run install Running run install for 2 packages... Package tbtc-client ... npm ERR! missing script: install npm ERR! A complete log of this run can be found in: npm ERR! /Users/jakub/.npm/_logs/2019-08-05T10_59_04_931Z-debug.log npm ERR! code ELIFECYCLE npm ERR! errno 1 npm ERR! tbtc-dapp@ install: `subpkg run install` npm ERR! Exit status 1 npm ERR! npm ERR! Failed at the tbtc-dapp@ install script. npm ERR! This is probably not a problem with npm. There is likely additional logging output above. npm ERR! A complete log of this run can be found in: npm ERR! /Users/jakub/.npm/_logs/2019-08-05T10_59_04_959Z-debug.log

Woah - I think I might've missed this from debugging. Will remove.

Let's don't add it. We need to remove this whole submodule thing probably since we've got dapp in the root. It was initially added to simplify tests execution but from now we will handle tests separately per module in the CI.

liamzebedee · 2019-08-05T11:33:55Z

Ok @nkuba manually tested after merging master, it passes. Let's merge?

nkuba · 2019-08-05T11:39:04Z

client/package.json

@@ -3,21 +3,35 @@
    "version": "0.0.1",
    "description": "",
    "scripts": {
-        "test": "mocha --timeout 5000",
+        "test": "CONFIG_FILE=${npm_package_config_file} mocha -r @babel/register --timeout 5000",


We no longer need to pass CONFIG_FILE=${npm_package_config_file} in the command.
This line should be:
"test": "mocha -r @babel/register --timeout 5000",

nkuba · 2019-08-05T11:39:30Z

client/package.json

@@ -3,21 +3,35 @@
    "version": "0.0.1",
    "description": "",
    "scripts": {
-        "test": "mocha --timeout 5000",
+        "test": "CONFIG_FILE=${npm_package_config_file} mocha -r @babel/register --timeout 5000",
+        "test:debug": "CONFIG_FILE=${npm_package_config_file} node --inspect node_modules/.bin/mocha -r @babel/register --timeout 5000",


We no longer need to pass CONFIG_FILE=${npm_package_config_file} in the command.
This line should be:
"test:debug": "node --inspect node_modules/.bin/mocha -r @babel/register --timeout 5000",

nkuba · 2019-08-05T11:46:53Z

client/package.json

        "js:lint": "eslint .",
        "js:lint:fix": "eslint --fix ."
    },
+    "main": "src/index.js",
+    "config": {


This config was removed in master. We should remove it also from this PR.

client/package.json

nkuba · 2019-08-05T11:48:12Z

client/src/FundingProof.js

@@ -64,5 +64,6 @@ async function calculateAndSubmitFundingProof(electrumClient, txID, fundingOutpu
 }

 module.exports = {
+  setElectrumConfig,


We don't need this change in this PR, right?

Nope, will remove

nkuba · 2019-08-05T11:50:09Z

client/test/DepositTest.js

+
+describe("Ethereum helpers", async () => {
+    before(async () => {        
+        Web3.providers.HttpProvider.prototype.sendAsync = Web3.providers.HttpProvider.prototype.send


What's this magic? Why do we need it?

Ahhhh I accidentally removed the comment on this.

This is an issue with an incompatibility between Web3 1.0 and Truffle's usage of Web3's API's. I will re-document this.
web3/web3.js#1119 for an explainer -

client/src/eth/copy-artifacts.sh

liamzebedee · 2019-08-05T14:41:48Z

@nkuba take another look!

nkuba · 2019-08-05T15:15:54Z

I'm merging this PR with failing CI check because CI is not ready yet.

liamzebedee added 8 commits August 1, 2019 19:59

Added newer JS syntax via Babel

eb2d89d

Checkin tbtc contract artifacts

454ac33

Add helper script to copy artifacts

2544311

Helper to load contract artifacts with defaults

f79d957

Export package modules better

ecfcef5

Temp fix for Electron config

12bb1ba

Test for createDeposit

05189d9

Implement createDeposit

06af12c

liamzebedee mentioned this pull request Aug 1, 2019

Fetch deposit BTC address (contract code) #25

Merged

pdyraga assigned nkuba Aug 2, 2019

pdyraga requested a review from nkuba August 2, 2019 09:13

liamzebedee marked this pull request as ready for review August 2, 2019 11:16

nkuba suggested changes Aug 3, 2019

View reviewed changes

nkuba mentioned this pull request Aug 4, 2019

Submit funding transaction proof #31

Merged

pdyraga assigned liamzebedee Aug 4, 2019

liamzebedee added 4 commits August 5, 2019 12:03

Doc createDeposit

85ba30d

Move dependencies into correct package.json

d350220

Remove code

565e187

Doc setDefaults

24fee71

nkuba reviewed Aug 5, 2019

View reviewed changes

client/src/eth/contracts.js Show resolved Hide resolved

nkuba reviewed Aug 5, 2019

View reviewed changes

liamzebedee added 5 commits August 5, 2019 13:07

Deleted unneeded artifacts

d77d95a

Only copy artifacts we need

443242b

Remove old install cmd

ff42054

Merge from master

72331fc

Doc param of setDefaults

1464ec8

nkuba suggested changes Aug 5, 2019

View reviewed changes

Doc Web3 hack

df592b2

liamzebedee added 2 commits August 5, 2019 16:39

Remove old code

bf30398

Document temp script

cfbd1c7

nkuba approved these changes Aug 5, 2019

View reviewed changes

nkuba merged commit 3c75e1d into master Aug 5, 2019

mhluongo deleted the make-a-deposit branch July 15, 2020 12:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make a deposit (contract code) #24

Make a deposit (contract code) #24

liamzebedee commented Aug 1, 2019 •

edited

Loading

nkuba left a comment

nkuba Aug 3, 2019

nkuba Aug 3, 2019

liamzebedee Aug 5, 2019

nkuba Aug 5, 2019

liamzebedee Aug 5, 2019

nkuba Aug 3, 2019

liamzebedee Aug 5, 2019

nkuba Aug 5, 2019

liamzebedee Aug 5, 2019

nkuba Aug 5, 2019

nkuba Aug 3, 2019

nkuba Aug 3, 2019

nkuba Aug 3, 2019

nkuba Aug 5, 2019

liamzebedee Aug 5, 2019

nkuba Aug 5, 2019

liamzebedee commented Aug 5, 2019

nkuba Aug 5, 2019

nkuba Aug 5, 2019

nkuba Aug 5, 2019

nkuba Aug 5, 2019

liamzebedee Aug 5, 2019 •

edited

Loading

nkuba Aug 5, 2019

liamzebedee Aug 5, 2019

liamzebedee commented Aug 5, 2019

nkuba commented Aug 5, 2019


		let electrumConfig

		export function setElectrumConfig(config) {

Make a deposit (contract code) #24

Make a deposit (contract code) #24

Conversation

liamzebedee commented Aug 1, 2019 • edited Loading

nkuba left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

liamzebedee commented Aug 5, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

liamzebedee Aug 5, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

liamzebedee commented Aug 5, 2019

nkuba commented Aug 5, 2019

liamzebedee commented Aug 1, 2019 •

edited

Loading

liamzebedee Aug 5, 2019 •

edited

Loading