bump Vault #704

InoMurko · 2020-09-17T15:18:56Z

Bumping the Vault version to the latest release.

execute on PR execute on PR execute on PR execute on PR execute on PR use the correct machine image use the correct machine image use the correct machine image use the correct machine image use the correct machine image use the correct machine image use the correct machine image use the correct machine image use the correct machine image use the correct machine image use the correct machine image use the correct machine image use the correct machine image use the correct machine image use the correct machine image use the correct machine image use the correct machine image use the correct machine image use the correct machine image use the correct machine image use the correct machine image use the correct machine image own the auth file own the auth file nodejs legacy rem node-gyp install

boolafish · 2020-10-01T00:33:41Z

.circleci/config.yml

@@ -96,12 +105,11 @@ jobs:
          name: Apply Overrides
          command: make init_multisig
          working_directory: ~/repo/MultiSigWalletOverride
+      # node symlink missing if there's not nodejs-legacy
+      - run: sudo apt-get update && sudo apt-get install -y build-essential libhidapi-dev libudev-dev libusb-1.0-0 libusb-1.0-0-dev nodejs-legacy


what's happening to the original nvm installation?

the intial problem was that ubuntu 14 (which is what cirleci uses if you don't define an image) uses a really old gcloud and docker and docker compose. that didn't allow me to authenticate towards our GCS registry. so I had to bump to ubuntu 16. image: ubuntu-1604:201903-01
now that broke helluva lot of things with gnosis 1.6 tag so I had to install nodejs-legacy to even be able to npm install.

boolafish · 2020-10-01T00:36:22Z

plasma_framework/migrations/1041_setup_vault.js

    const transaction = await web3.eth.sendTransaction({ gas: gas, to: gnosisMultisigAddress, from: deployerAddress, data: gnosisFeeRegisterExitGame });
    console.log(`Submitted transaction with hash for ${whatLog}: ${transaction.transactionHash}`);
+    console.log(`Full log for ${whatLog}: ${transaction}`);
    await waitForReceipt(whatLog, transaction);
 };

 const setVersion = async (whatLog, plasmaFramework, sha, gnosisMultisigAbi, gnosisMultisigAddress, deployerAddress) => {
    const setVersionCall = web3.eth.abi.encodeFunctionCall(plasmaFramework.abi.find(o => o.name === 'setVersion'), [`${pck.version}+${sha}`]);
    const gnosisSetVersion = web3.eth.abi.encodeFunctionCall(gnosisMultisigAbi, [plasmaFramework.address, 0, setVersionCall]);
    const gas = await web3.eth.estimateGas({ to: gnosisMultisigAddress, from: deployerAddress, data: gnosisSetVersion });


do we not need *2 for this one?

not sure, but at the moment even if it's reverted, there's no impact. the version I'll build after this PR will handle all these cases.

boolafish · 2020-10-01T00:38:20Z

plasma_framework/migrations/1041_setup_vault.js

@@ -40,45 +40,55 @@ const waitForReceipt = async (whatLog, transaction) => {
 const setDepositVerifier = async (whatLog, ethVault, ethDepositVerifier, gnosisMultisigAbi, gnosisMultisigAddress, deployerAddress) => {
    const setDepositVerifierCall = web3.eth.abi.encodeFunctionCall(ethVault.abi.find(o => o.name === 'setDepositVerifier'), [ethDepositVerifier.address]);
    const gnosisSetDepositVerifier = web3.eth.abi.encodeFunctionCall(gnosisMultisigAbi, [ethVault.address, 0, setDepositVerifierCall]);
-    const gas = await web3.eth.estimateGas({ to: gnosisMultisigAddress, from: deployerAddress, data: gnosisSetDepositVerifier });
+    const gas = await web3.eth.estimateGas({ to: gnosisMultisigAddress, from: deployerAddress, data: gnosisSetDepositVerifier }) * 2;


nitpick: the await web3.eth.estimateGas() part is quite long, reading wise the *2 is not that obvious at my first glance. Might be slightly clearer with the following

const estimateGas = await web3.eth.estimateGas({ to: gnosisMultisigAddress, from: deployerAddress, data: gnosisSetDepositVerifier }) const transaction = await web3.eth.sendTransaction({ gas: estimateGas * 2, to: gnosisMultisigAddress, from: deployerAddress, data: gnosisSetDepositVerifier });

makes sense!

also,

all of this is really not optimal at the moment, but it onblocks me on some other things. I will come back to this and make some adjustments - (like to be able to retry a certain transaction by maintaining some sort of state (like truffle migration does)). just FYI.

boolafish · 2020-10-01T00:39:59Z

MultiSigWalletOverride/docker/immutability/config/entrypoint.sh

+#  chown -R nobody:nobody $CONFIG_DIR && chmod -R 777 $CONFIG_DIR
+}
+
+gencerts


I am not a script expert so I don't know what should be best practice, but shall we run commands after all function declaration so we don't mix reading command and function declaration together ??

this is really just a copy/clone of what comes with vault. and it's purpose is to be able to standup and test the "migration integration" really works!

souradeep-das · 2020-10-01T10:33:55Z

plasma_framework/migrations/1041_setup_vault.js

@@ -41,44 +41,54 @@ const setDepositVerifier = async (whatLog, ethVault, ethDepositVerifier, gnosisM
    const setDepositVerifierCall = web3.eth.abi.encodeFunctionCall(ethVault.abi.find(o => o.name === 'setDepositVerifier'), [ethDepositVerifier.address]);
    const gnosisSetDepositVerifier = web3.eth.abi.encodeFunctionCall(gnosisMultisigAbi, [ethVault.address, 0, setDepositVerifierCall]);
    const gas = await web3.eth.estimateGas({ to: gnosisMultisigAddress, from: deployerAddress, data: gnosisSetDepositVerifier });
-    const transaction = await web3.eth.sendTransaction({ gas: gas, to: gnosisMultisigAddress, from: deployerAddress, data: gnosisSetDepositVerifier });
+    console.log(`The amount of gas used for ${whatLog}: ${gas}`);


Can we log the correct value of gas sent here too ( *2 ) and for all the logs

souradeep-das · 2020-10-01T10:37:01Z

MultiSigWalletOverride/docker/immutability/config/entrypoint.sh


 # Don't exit until vault dies
-wait $VAULT_PID
+
+wait $VAULT_PID


a newline if you want

InoMurko force-pushed the inomurko/latest_vault branch from 13b382a to 065d391 Compare September 21, 2020 13:59

InoMurko marked this pull request as ready for review September 21, 2020 13:59

[email protected] added 4 commits September 21, 2020 16:08

gcs stuff

a574694

gcs stuff

9a514e5

gcs stuff

334fe2d

gcs stuff

cc14e41

InoMurko requested review from souradeep-das, boolafish and kevsul September 21, 2020 14:14

InoMurko changed the title ~~execute on PR~~ bump Vault Sep 21, 2020

Ino Murko added 19 commits September 22, 2020 20:13

allow writing to config

a3ab575

latest entrypoint

d9f6f5a

change port

563ae20

allow writing to config

0674d27

change port

d26abbb

rem gencerts

a7b03ea

allow writing to config

b0f6d69

allow writing to config

fa1926b

allow writing to config

b7514ea

docker logs

c544a0d

docker logs

365ea6d

skip rm

aa512ee

cleanup

4259e72

wait for boot

71ee4df

wait for some blocks in between gnosis execution

292474b

wait for some blocks in between gnosis execution

23f9bda

wait for some blocks in between gnosis execution

ca109fa

wait for some blocks in between gnosis execution

8e506c1

wait for some blocks in between gnosis execution

b431c4d

[email protected] added 3 commits September 30, 2020 14:44

wait for some blocks in between gnosis execution

eb18f78

double the estimation

592d453

gas log

ddbd40b

boolafish reviewed Oct 1, 2020

View reviewed changes

multiply gas elsewhere for readability

bc4447c

souradeep-das approved these changes Oct 1, 2020

View reviewed changes

boolafish approved these changes Oct 1, 2020

View reviewed changes

[email protected] added 2 commits October 1, 2020 18:13

gas readability

9711d68

newline and sleep

0fb569d

InoMurko merged commit 1758349 into v2.0.0 Oct 1, 2020

InoMurko deleted the inomurko/latest_vault branch October 1, 2020 16:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bump Vault #704

bump Vault #704

InoMurko commented Sep 17, 2020 •

edited

Loading

boolafish Oct 1, 2020

InoMurko Oct 1, 2020

boolafish Oct 1, 2020

InoMurko Oct 1, 2020

boolafish Oct 1, 2020

InoMurko Oct 1, 2020

boolafish Oct 1, 2020

InoMurko Oct 1, 2020

souradeep-das Oct 1, 2020

InoMurko Oct 1, 2020

souradeep-das Oct 1, 2020

bump Vault #704

bump Vault #704

Conversation

InoMurko commented Sep 17, 2020 • edited Loading

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

InoMurko commented Sep 17, 2020 •

edited

Loading