From 2e046f742be5bf01a69555bceb3acff5550b6ab4 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Wed, 16 Jun 2021 18:48:11 -0600 Subject: [PATCH 1/3] fix(deployment): ensure that the faucet is given urun --- packages/deployment/ansible/cosmos-genesis.yml | 2 +- .../ansible/roles/cosmos-genesis/files/faucet-helper.sh | 1 + packages/deployment/ansible/roles/cosmos-genesis/tasks/main.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/deployment/ansible/cosmos-genesis.yml b/packages/deployment/ansible/cosmos-genesis.yml index bf6e8553e80..2c7bc7cafa7 100644 --- a/packages/deployment/ansible/cosmos-genesis.yml +++ b/packages/deployment/ansible/cosmos-genesis.yml @@ -9,8 +9,8 @@ - BOOTSTRAP_TOKENS: 100provisionpass - CHAIN_NAME: "{{ lookup('file', SETUP_HOME + '/ag-chain-cosmos/chain-name.txt') }}" - NETWORK_CONFIG_URL: https://testnet.agoric.com/network-config + - FAUCET_TOKENS: "{{ lookup('file', SETUP_HOME + '/boot-tokens.txt') }}" - STAKER: ag-staker - - STAKER_TOKENS: 10000000000000000000000000ubld - STAKER_INIT_COINS: 62000000ubld - STAKER_SELF_DELEGATION: 50000000ubld - STAKER_NODE: validator0 diff --git a/packages/deployment/ansible/roles/cosmos-genesis/files/faucet-helper.sh b/packages/deployment/ansible/roles/cosmos-genesis/files/faucet-helper.sh index 1bce25a0421..919a8cd5496 100644 --- a/packages/deployment/ansible/roles/cosmos-genesis/files/faucet-helper.sh +++ b/packages/deployment/ansible/roles/cosmos-genesis/files/faucet-helper.sh @@ -93,6 +93,7 @@ while [[ ${#rpcAddrs[@]} -gt 0 ]]; do echo "$ADDR:$DELEGATE_COINS:$NAME" >> $thisdir/cosmos-delegates.txt exit 0 fi + exit $? ;; *) echo 1>&2 "Unknown operation $OP" diff --git a/packages/deployment/ansible/roles/cosmos-genesis/tasks/main.yml b/packages/deployment/ansible/roles/cosmos-genesis/tasks/main.yml index 15c51dbde7a..8c8e91e7fff 100644 --- a/packages/deployment/ansible/roles/cosmos-genesis/tasks/main.yml +++ b/packages/deployment/ansible/roles/cosmos-genesis/tasks/main.yml @@ -50,7 +50,7 @@ become_user: "{{ service }}" shell: "\ {{ service }} add-genesis-account \ - {{ faucet }} {{ STAKER_TOKENS }},{{ BOOTSTRAP_TOKENS }}" + {{ faucet }} {{ FAUCET_TOKENS }},{{ BOOTSTRAP_TOKENS }}" - name: "Add {{ STAKER_INIT_COINS }} coins to {{ STAKER }}-{{ STAKER_NODE }}" become: yes From e6cf9b92f70dbd4dc38ba4e2c2d38438fc3e7cea Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Thu, 17 Jun 2021 09:19:14 -0600 Subject: [PATCH 2/3] chore(xsnap): ignore test-generated files --- packages/xsnap/.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/xsnap/.gitignore b/packages/xsnap/.gitignore index 9d0b71a3c79..04f5262f86f 100644 --- a/packages/xsnap/.gitignore +++ b/packages/xsnap/.gitignore @@ -1,2 +1,4 @@ build dist +test/fixture-snap-pool/ +test/fixture-snap-shot.xss From 98544462b469cce8b3365223fc31a4ca305e610f Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Thu, 17 Jun 2021 16:07:11 -0600 Subject: [PATCH 3/3] fix(cosmos): have daemon also trap os.Interrupt for good luck --- golang/cosmos/daemon/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/golang/cosmos/daemon/main.go b/golang/cosmos/daemon/main.go index 0da8ef9af25..f5e0a6bf481 100644 --- a/golang/cosmos/daemon/main.go +++ b/golang/cosmos/daemon/main.go @@ -60,7 +60,7 @@ func RunWithController(sendToController cmd.Sender) { // Exit on Control-C and kill. // Without this explicitly, ag-chain-cosmos ignores them. sigs := make(chan os.Signal, 1) - signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM) + signal.Notify(sigs, os.Interrupt, syscall.SIGINT, syscall.SIGTERM) go func() { <-sigs os.Exit(98)