From ece82611c7d3a516c17b2f9c2e1a4d754d764cc8 Mon Sep 17 00:00:00 2001
From: nuco-shidokht <shidokht@nuco.io>
Date: Tue, 15 Oct 2019 14:03:19 -0400
Subject: [PATCH] Made initial self bond value an input parameter to the script

---
 ReadMe.md               |   3 ++-
 Tools.jar               | Bin 173776 -> 174861 bytes
 registerPool.sh         |  12 +++++++-----
 src/cli/EncodeType.java |  27 +++++++++++++++++++++++++++
 4 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 src/cli/EncodeType.java

diff --git a/ReadMe.md b/ReadMe.md
index 461cf9d..d0f6392 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -32,7 +32,7 @@ Pool will be in an active state after registration is complete.
 
 **Usage:**
 
-```./registerPool.sh node_address private_key signing_address commission_rate metadata_url metadata_content_hash```
+```./registerPool.sh node_address private_key signing_address commission_rate metadata_url metadata_content_hash value```
 
 `node_address` node address in ip:port format.<br />
 `private_key` private key of the pool identity address. Private key should start with `0x`. Both 32 and 64 byte keys are accepted as an input.<br />
@@ -40,6 +40,7 @@ Pool will be in an active state after registration is complete.
 `commission_rate` the pool commission rate with 4 decimal places of granularity (between [0, 1000000]).<br />
 `metadata_url` url hosting the metadata json file.<br />
 `metadata_content_hash` Blake2b hash of the json object hosted at the metadata url.<br />
+`value` value in nAmps to pass along the transaction. This will be counted towards the self-bond value and has to be at least 1000 Aions (1000000000000000000000 nAmps).<br />
 
 ### delegate.sh
 
diff --git a/Tools.jar b/Tools.jar
index 80299a1f9a17bc5283f77c383b3be3aae5552861..7cec734f8ba7887c6fe82c24a91ce5aaf39daa0c 100644
GIT binary patch
delta 3362
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
M^C{|10+3DjKM11?DF6Tf

delta 2497
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

diff --git a/registerPool.sh b/registerPool.sh
index 49efb74..151170a 100755
--- a/registerPool.sh
+++ b/registerPool.sh
@@ -2,7 +2,7 @@
 # -----------------------------------------------------------------------------
 # This script can be used to register a pool and do self bond.
 #
-# Usage: ./registerPool.sh node_address private_key signing_address commission_rate metadata_url metadata_content_hash
+# Usage: ./registerPool.sh node_address private_key signing_address commission_rate metadata_url metadata_content_hash value
 # -----------------------------------------------------------------------------
 
 POOL_REGISTRY_ADDRESS="0xa01b68fa4f947ea4829bebdac148d1f7f8a0be9a8fd5ce33e1696932bef05356"
@@ -73,10 +73,10 @@ function get_coinbase(){
     fi
 }
 
-if [ $# -ne 6 ]
+if [ $# -ne 7 ]
 then
     echo "Invalid number of parameters."
-    echo "Usage: ./registerPool.sh node_address(ip:port) private_key signing_address commission_rate metadata_url metadata_content_hash"
+    echo "Usage: ./registerPool.sh node_address(ip:port) private_key signing_address commission_rate metadata_url metadata_content_hash value"
     exit 1
 fi
 node_address="$1"
@@ -85,6 +85,7 @@ signing_address="$3"
 commission="$4"
 metadata_url="$5"
 metadata_content_hash="$6"
+amount="$7"
 
 if [ ${#private_key} == 130 ]
 then
@@ -107,7 +108,7 @@ echo "Using nonce $NONCE"
 echo "Sending registration call..."
 # registerStaker(Address signingAddress, int commissionRate, byte[] metaDataUrl, byte[] metaDataContentHash)
 callPayload="$(java -cp $TOOLS_JAR cli.ComposeCallPayload "registerPool" "$signing_address" "$commission" "$metadata_url" "$metadata_content_hash")"
-receipt=`./rpc.sh --call "$private_key" "$NONCE" "$POOL_REGISTRY_ADDRESS" "$callPayload" "1000000000000000000000"`
+receipt=`./rpc.sh --call "$private_key" "$NONCE" "$POOL_REGISTRY_ADDRESS" "$callPayload" "$amount"`
 require_success $?
 
 echo "Transaction hash: \"$receipt\".  Waiting for transaction to complete..."
@@ -117,8 +118,9 @@ echo "Transaction completed"
 echo "Verifying that pool was registered and is active..."
 # getStake(Address pool, Address staker)
 callPayload="$(java -cp $TOOLS_JAR cli.ComposeCallPayload "getStake" "$identity_address" "$identity_address")"
+amount_hex="$(java -cp $TOOLS_JAR cli.EncodeType "BigInteger" "$amount")"
 # This result in a BigInteger:  0x23 (byte), length (byte), value (big-endian length bytes)
-verify_state "$POOL_REGISTRY_ADDRESS" "$callPayload" "0x23093635c9adc5dea00000"
+verify_state "$POOL_REGISTRY_ADDRESS" "$callPayload" "$amount_hex"
 echo "Current stake = 1000 Aions"
 
 callPayload="$(java -cp $TOOLS_JAR cli.ComposeCallPayload "isActive" "$identity_address")"
diff --git a/src/cli/EncodeType.java b/src/cli/EncodeType.java
new file mode 100644
index 0000000..488803a
--- /dev/null
+++ b/src/cli/EncodeType.java
@@ -0,0 +1,27 @@
+package cli;
+
+import net.i2p.crypto.eddsa.Utils;
+import org.aion.avm.userlib.abi.ABIEncoder;
+
+import java.math.BigInteger;
+
+public class EncodeType {
+    public static void main(String[] args) {
+        if (0 == args.length) {
+            System.err.println("Usage: cli.EncodeType Type");
+            System.exit(1);
+        }
+
+        byte[] rawCallData = null;
+        String type = args[0];
+        switch (type) {
+            case "BigInteger":
+                rawCallData = ABIEncoder.encodeOneBigInteger(new BigInteger(args[1]));
+                break;
+            default:
+                System.err.println("Type " + type + " is not defined.");
+                System.exit(1);
+        }
+        System.out.println("0x" + Utils.bytesToHex(rawCallData));
+    }
+}