Merge branch 'master' of github.com:certusone/wormhole

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

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)

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