From 4b24a74547f0b246b1a2c9845875f1e1dc1ce772 Mon Sep 17 00:00:00 2001
From: Leo <leo@certus.one>
Date: Fri, 21 Aug 2020 22:53:27 +0200
Subject: [PATCH] agent: use max commitment and fix nonce type

It appears that single confirmation level is not useful
for transactions that depend on each other.
---
 bridge/pkg/solana/watcher.go | 3 +++
 solana/cli/src/main.rs       | 2 +-
 solana/devnet_setup.sh       | 6 ++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bridge/pkg/solana/watcher.go b/bridge/pkg/solana/watcher.go
index b02e7ed11..a16034ccb 100644
--- a/bridge/pkg/solana/watcher.go
+++ b/bridge/pkg/solana/watcher.go
@@ -73,6 +73,9 @@ func (e *SolanaBridgeWatcher) Run(ctx context.Context) error {
 
 			switch event := ev.Event.(type) {
 			case *agentv1.LockupEvent_New:
+				logger.Info("received lockup event",
+					zap.Any("event", ev))  // TODO: debug level
+
 				lock := &common.ChainLock{
 					TxHash:        eth_common.HexToHash(ev.LockupAddress),
 					Timestamp:     time.Time{}, // FIXME
diff --git a/solana/cli/src/main.rs b/solana/cli/src/main.rs
index 9b028e9d9..521a933d3 100644
--- a/solana/cli/src/main.rs
+++ b/solana/cli/src/main.rs
@@ -933,7 +933,7 @@ fn main() {
                 )
                 .arg(
                     Arg::with_name("nonce")
-                        .validator(is_u8)
+                        .validator(is_u32)
                         .value_name("NONCE")
                         .takes_value(true)
                         .index(6)
diff --git a/solana/devnet_setup.sh b/solana/devnet_setup.sh
index e3cd9f73c..d07f42014 100755
--- a/solana/devnet_setup.sh
+++ b/solana/devnet_setup.sh
@@ -2,6 +2,8 @@
 # This script configures the devnet for test transfers with hardcoded addresses.
 set -x
 
+# TODO: run as solana devnet sidecar
+
 # Configure CLI (works the same as upstream Solana CLI)
 mkdir -p ~/.config/solana/cli
 cat <<EOF > ~/.config/solana/cli/config.yml
@@ -43,6 +45,6 @@ retry cli mint "$token" 10000000000 "$account"
 
 # Do lock transactions <3
 while : ; do
-  cli lock "$bridge_address" "$account" "$token" 10 "$chain_id_ethereum" "$((RANDOM % 254))"
-  sleep 5
+  cli lock "$bridge_address" "$account" "$token" 10 "$chain_id_ethereum" "$RANDOM"
+  sleep 1
 done