bump: demurrage voucher (minor fixes)

`base_requirements.txt` can now be kept directly in sync with the `cicnet/cic` repo, as the proxy (and down the line maybe other things) are not relevant for the higher-level cic context.

Co-authored-by: lash <dev@holbrook.no>
Reviewed-on: #2
Co-authored-by: lash <accounts-grassrootseconomics@holbrook.no>
Co-committed-by: lash <accounts-grassrootseconomics@holbrook.no>

.gitignore

@@ -0,0 +1,2 @@
+.venv/
+.env

base_requirements.txt

@@ -0,0 +1,16 @@
+chainlib-eth==0.4.23
+chainlib==0.4.14
+eth-erc20==0.7.3
+eth-erc721==0.2.1
+eth-erc712==0.0.1
+ccw==0.0.6
+eth-accounts-index==0.5.2
+eth-contract-registry==0.11.0
+erc20-faucet==0.8.0
+eth-address-index==0.7.3
+eth-token-index==0.6.2
+eth-faucet==0.3.4
+erc20-transfer-authorization==0.5.0
+erc20-demurrage-token==0.5.6
+eth-interface==0.1.1
+#cic-contracts==0.2.0

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
 

requirements.txt

@@ -1,16 +1 @@
-chainlib-eth==0.4.17
-chainlib==0.4.12
-eth-erc20==0.7.3
-eth-erc721==0.2.1
-ccw==0.0.6
-eth-accounts-index==0.5.1
-eth-contract-registry==0.11.0
-erc20-faucet==0.8.0
-eth-address-index==0.7.2
-eth-token-index==0.6.0
-eth-faucet==0.3.4
-erc20-transfer-authorization==0.5.0
-erc20-demurrage-token==0.5.2
-eth-interface==0.1.1
-#cic-contracts==0.2.0
-#defalsify-evm==0.2.0
+custodial-registration-proxy==0.1.0