From 2e4ea1eb87b7b57cc6b111fd9d76667dceaca497 Mon Sep 17 00:00:00 2001
From: Mohamed Sohail <kamikazechaser@noreply.localhost>
Date: Tue, 28 Mar 2023 07:05:38 +0000
Subject: [PATCH] Add custodial proxy and update defaults (#1)

Add:

- Custodial proxy contract

Fixes:

- Deploying the voucher takes a bit more than 5M

Also changed defaults:

- Voucher name
- Voucher symbol
- Faucet gift amount (worth 30 transfers)
- Faucet gift threshold (worth 5 transfers)
- Facuet period (every 24 hrs)

Co-authored-by: Mohammed Sohail <sohailsameja@gmail.com>
Reviewed-on: https://git.grassecon.net/grassrootseconomics/celo-bootstrap/pulls/1
Co-authored-by: Mohamed Sohail <kamikazechaser@noreply.localhost>
Co-committed-by: Mohamed Sohail <kamikazechaser@noreply.localhost>
---
 .gitignore       |  2 ++
 boot.sh          | 18 +++++++++++++-----
 requirements.txt |  1 +
 3 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..055b8c0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.venv/
+.env
diff --git a/boot.sh b/boot.sh
index 50b5e4d..d1e0b53 100644
--- a/boot.sh
+++ b/boot.sh
@@ -3,15 +3,19 @@ CHAIN_SPEC=${CHAIN_SPEC:-evm:celo:1337:celo}
 KEY_FILE=${KEY_FILE:-keyfile.json}
 RPC_DIALECT=${RPC_DIALECT:-chainlib_eth_celo}
 
-TOKEN_NAME="Testtoken"
-TOKEN_SYMBOL=TST
+TOKEN_NAME="TrainingVoucher"
+TOKEN_SYMBOL=TRN
 TOKEN_DECIMALS=6
 TOKEN_DEMURRAGE=20000
 TOKEN_PERIOD=43200
 TOKEN_SINK_ADDRESS=${TOKEN_SINK_ADDRESS:-Eb3907eCad74a0013c259D5874AE7f22DcBcC95C}
-GAS_FAUCET_AMOUNT=${GAS_FAUCET_AMOUNT:-20000000}
+# 30 * 20000000010 * 100000
+GAS_FAUCET_AMOUNT=${GAS_FAUCET_AMOUNT:-60000000030000000}
+# 5 * 20000000010 * 100000
+GAS_FAUCET_THRESHOLD=${GAS_FAUCET_THRESHOLD:-10000000005000000}
+# 24 hrs
+GAS_FAUCET_PERIOD=${GAS_FAUCET_PERIOD:-86400}
 log='-v'
-
 set +e
 
 t=$(mktemp -d)
@@ -63,14 +67,18 @@ eth-encode -y $KEY_FILE --mode tx --signature addWriter a:$writer -e $(eth-check
 eth-encode -y $KEY_FILE --mode tx --signature addWriter a:$writer -e $(eth-checksum $token) --fee-limit 100000 -s -w $log
 eth-encode -y $KEY_FILE --mode tx --signature addWriter a:$writer -e $(eth-checksum $index) --fee-limit 100000 -s -w $log
 
+# publish custodial registration proxy
+proxy=$(ge-custodial-registration-proxy-publish -y $KEY_FILE --fee-limit 2000000 -s -w $log --eth-faucet-address $gasfaucet --account-index-address $accounts --training-voucher-address $token --system-account-address $publisher | tee $t/proxy.txt)
+
 # publish contract registry
-contracts=$(eth-contract-registry-publish -y $KEY_FILE  --fee-limit 2000000 -s -w $log --identifier TrainingVoucher --identifier AccountIndex --identifier TokenIndex --identifier GasFaucet | tee $t/contracts.txt)
+contracts=$(eth-contract-registry-publish -y $KEY_FILE  --fee-limit 2000000 -s -w $log --identifier TrainingVoucher --identifier AccountIndex --identifier TokenIndex --identifier GasFaucet --identifier CustodialRegistrationProxy | tee $t/contracts.txt)
 contracts=$(eth-checksum $contracts)
 
 eth-contract-registry-set -y $KEY_FILE  --fee-limit 100000 -s -w $log -e $contracts -a $(eth-checksum $token) TrainingVoucher
 eth-contract-registry-set -y $KEY_FILE  --fee-limit 100000 -s -w $log -e $contracts -a $(eth-checksum $accounts) AccountIndex
 eth-contract-registry-set -y $KEY_FILE  --fee-limit 100000 -s -w $log -e $contracts -a $(eth-checksum $index) TokenIndex
 eth-contract-registry-set -y $KEY_FILE  --fee-limit 100000 -s -w $log -e $contracts -a $(eth-checksum $gasfaucet) GasFaucet
+eth-contract-registry-set -y $KEY_FILE  --fee-limit 100000 -s -w $log -e $contracts -a $(eth-checksum $proxy) CustodialRegistrationProxy
 
 set -e
 
diff --git a/requirements.txt b/requirements.txt
index ba4eed1..160ed0a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,5 +12,6 @@ eth-faucet==0.3.4
 erc20-transfer-authorization==0.5.0
 erc20-demurrage-token==0.5.2
 eth-interface==0.1.1
+custodial-registration-proxy==0.1.0
 #cic-contracts==0.2.0
 #defalsify-evm==0.2.0