certusone
/
wormhole
mirror of https://github.com/certusone/wormhole.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Hendrik Hofstadt 2020-08-21 22:56:32 +02:00
parent e3dcc654fb 4b24a74547
commit 2cd0d38e3d
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bridge/pkg/solana/watcher.go
View File

@ -73,6 +73,9 @@ func (e *SolanaBridgeWatcher) Run(ctx context.Context) error {
switch event := ev.Event.(type) { switch event := ev.Event.(type) {
case *agentv1.LockupEvent_New: case *agentv1.LockupEvent_New:
logger.Info("received lockup event",
zap.Any("event", ev)) // TODO: debug level
lock := &common.ChainLock{ lock := &common.ChainLock{
TxHash: eth_common.HexToHash(ev.LockupAddress), TxHash: eth_common.HexToHash(ev.LockupAddress),
Timestamp: time.Time{}, // FIXME Timestamp: time.Time{}, // FIXME

2
solana/cli/src/main.rs
View File

@ -933,7 +933,7 @@ fn main() {
) )
.arg( .arg(
Arg::with_name("nonce") Arg::with_name("nonce")
.validator(is_u8) .validator(is_u32)
.value_name("NONCE") .value_name("NONCE")
.takes_value(true) .takes_value(true)
.index(6) .index(6)

6
solana/devnet_setup.sh
View File

@ -2,6 +2,8 @@
# This script configures the devnet for test transfers with hardcoded addresses. # This script configures the devnet for test transfers with hardcoded addresses.
set -x set -x
# TODO: run as solana devnet sidecar
# Configure CLI (works the same as upstream Solana CLI) # Configure CLI (works the same as upstream Solana CLI)
mkdir -p ~/.config/solana/cli mkdir -p ~/.config/solana/cli
cat <<EOF > ~/.config/solana/cli/config.yml cat <<EOF > ~/.config/solana/cli/config.yml
@ -43,6 +45,6 @@ retry cli mint "$token" 10000000000 "$account"
# Do lock transactions <3 # Do lock transactions <3
while : ; do while : ; do
cli lock "$bridge_address" "$account" "$token" 10 "$chain_id_ethereum" "$((RANDOM % 254))" cli lock "$bridge_address" "$account" "$token" 10 "$chain_id_ethereum" "$RANDOM"
sleep 5 sleep 1
done done