Merge branch 'develop' into feature/wait-blocks-confirm

Author: ElliotFriedman

.github/workflows/integrationtest.yml

@@ -0,0 +1,14 @@
+name: Run integration tests
+on: [push]
+jobs:
+  integration-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up linux environment
+        run: # installs development tools and updates .bash_profile
+          bash test/integration/setup-linux-environment.sh
+      - name: Execute integration tests
+        run: |
+          source $HOME/.bash_profile
+          bash test/integration/start-integration-env.sh

.github/workflows/smart-contracts.yml

@@ -0,0 +1,34 @@
+name: Smart Contracts
+
+on:
+  pull_request:
+    paths: ['smart-contracts/**']
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: smart-contracts
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Use Node.js
+        uses: actions/setup-node@v2.1.2
+        with:
+          node-version: '14.x'
+
+      - name: Install dependencies
+        run: npm install
+        env:
+          CI: true
+
+      - name: Install truffle
+        run: npm i -g truffle
+
+      - name: Test Setup
+        run: npm run test:setup
+
+      - name: Run truffle tests
+        run: npm run test

cmd/ebrelayer/txs/parser.go

@@ -63,7 +63,7 @@ func EthereumEventToEthBridgeClaim(valAddr sdk.ValAddress, event *types.Ethereum
 		symbol = strings.Join(res[1:], "")
 	}
 
-	amount := event.Value.Int64()
+	amount := sdk.NewIntFromBigInt(event.Value)
 
 	// Nonce type casting (*big.Int -> int)
 	nonce := int(event.Nonce.Int64())
@@ -133,7 +133,7 @@ func BurnLockEventToCosmosMsg(claimType types.Event, attributes []tmKv.Pair) (ty
 	var cosmosSenderSequence *big.Int
 	var ethereumReceiver common.Address
 	var symbol string
-	var amount *big.Int
+	var amount sdk.Int
 
 	for _, attribute := range attributes {
 		key := string(attribute.GetKey())
@@ -169,8 +169,7 @@ func BurnLockEventToCosmosMsg(claimType types.Event, attributes []tmKv.Pair) (ty
 				symbol = strings.ToUpper(val)
 			}
 		case types.Amount.String():
-			tempAmount := new(big.Int)
-			tempAmount, ok := tempAmount.SetString(val, 10)
+			tempAmount, ok := sdk.NewIntFromString(val)
 			if !ok {
 				log.Println("Invalid amount:", val)
 				return types.CosmosMsg{}, errors.New("invalid amount:" + val)

cmd/ebrelayer/txs/parser_test.go

@@ -31,7 +31,7 @@ func TestLogLockToEthBridgeClaim(t *testing.T) {
 	// Set up expected EthBridgeClaim
 	expectedEthBridgeClaim := ethbridge.NewEthBridgeClaim(
 		TestEthereumChainID, testBridgeContractAddress, TestNonce, strings.ToLower(TestSymbol), testTokenContractAddress,
-		testEthereumAddress, testCosmosAddress, testCosmosValidatorBech32Address, TestAmount, TestLockClaimType)
+		testEthereumAddress, testCosmosAddress, testCosmosValidatorBech32Address, testSDKAmount, TestLockClaimType)
 
 	// Create test ethereum event
 	ethereumEvent := CreateTestLogEthereumEvent(t)
@@ -111,10 +111,10 @@ func TestMsgBurnToProphecyClaim(t *testing.T) {
 	expectedProphecyClaim := ProphecyClaim{
 		ClaimType:            types.MsgBurn,
 		CosmosSender:         []byte(TestCosmosAddress1),
-		CosmosSenderSequence: big.NewInt(int64(TestCosmosAddressSequence)),
+		CosmosSenderSequence: big.NewInt(1),
 		EthereumReceiver:     common.HexToAddress(TestEthereumAddress1),
 		Symbol:               symbol,
-		Amount:               big.NewInt(int64(TestAmount)),
+		Amount:               testSDKAmount,
 	}
 
 	// Create a MsgBurn as input parameter
@@ -129,10 +129,10 @@ func TestMsgLockToProphecyClaim(t *testing.T) {
 	expectedProphecyClaim := ProphecyClaim{
 		ClaimType:            types.MsgLock,
 		CosmosSender:         []byte(TestCosmosAddress1),
-		CosmosSenderSequence: big.NewInt(int64(TestCosmosAddressSequence)),
+		CosmosSenderSequence: big.NewInt(1),
 		EthereumReceiver:     common.HexToAddress(TestEthereumAddress1),
 		Symbol:               TestSymbol,
-		Amount:               big.NewInt(int64(TestAmount)),
+		Amount:               testSDKAmount,
 	}
 
 	// Create a MsgLock as input parameter

cmd/ebrelayer/txs/relayToEthereum.go

@@ -42,7 +42,7 @@ func RelayProphecyClaimToEthereum(provider string, contractAddress common.Addres
 	// Send transaction
 	fmt.Println("Sending new ProphecyClaim to CosmosBridge...")
 	tx, err := cosmosBridgeInstance.NewProphecyClaim(auth, uint8(claim.ClaimType),
-		claim.CosmosSender, claim.CosmosSenderSequence, claim.EthereumReceiver, claim.Symbol, claim.Amount)
+		claim.CosmosSender, claim.CosmosSenderSequence, claim.EthereumReceiver, claim.Symbol, claim.Amount.BigInt())
 	if err != nil {
 		log.Println(err)
 		return err

cmd/ebrelayer/txs/test_common.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 	"testing"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/ethereum/go-ethereum/common"
 	tmKv "github.com/tendermint/tendermint/libs/kv"
 
@@ -25,20 +26,22 @@ const (
 	TestNonce                 = 19
 	TestEthTokenAddress       = "0x0000000000000000000000000000000000000000"
 	TestSymbol                = "CETH"
-	TestAmount                = 5
 	TestEthereumAddress1      = "0x7B95B6EC7EbD73572298cEf32Bb54FA408207359"
 	TestEthereumAddress2      = "0xc230f38FF05860753840e0d7cbC66128ad308B67"
 	TestCosmosAddress1        = "cosmos1gn8409qq9hnrxde37kuxwx5hrxpfpv8426szuv"
 	TestCosmosAddress2        = "cosmos1l5h2x255pvdy9l4z0hf9tr8zw7k657s97wyz7y"
+	TestExpectedMessage       = "8d46d2f689aa50a0dde8563f4ab1c90f4f74a80817ad18052ef1aa8bd5a0fd96"
 	TestCosmosAddressSequence = 1
-	TestExpectedMessage       = "d39d3a837b322ea6355a4de856bb88e0a1a33a1a9655767df2fa947f42ebcda6"
 	TestExpectedSignature     = "f3b43b87b8b3729d6b380a640954d14e425acd603bc98f5da8437cba9e492e7805c437f977900cf9cfbeb9e0e2e6fc5b189723b0979efff1fc2796a2daf4fd3a01" //nolint:lll
 	TestAddrHex               = "970e8128ab834e8eac17ab8e3812f010678cf791"
 	TestPrivHex               = "289c2857d4598e37fb9647507e47a309d6133539bf21a8b9cb6df88fd5232032"
 	TestNullAddress           = "0x0000000000000000000000000000000000000000"
 	TestOtherAddress          = "0x1000000000000000000000000000000000000000"
 )
 
+var testAmount = big.NewInt(5)
+var testSDKAmount = sdk.NewIntFromBigInt(testAmount)
+
 // CreateTestLogEthereumEvent creates a sample EthereumEvent event for testing purposes
 func CreateTestLogEthereumEvent(t *testing.T) types.EthereumEvent {
 	testEthereumChainID := big.NewInt(int64(TestEthereumChainID))
@@ -52,7 +55,7 @@ func CreateTestLogEthereumEvent(t *testing.T) types.EthereumEvent {
 	testEthereumSender := common.HexToAddress(TestEthereumAddress1)
 	testCosmosRecipient := []byte(TestCosmosAddress1)
 	testTokenAddress := common.HexToAddress(TestEthTokenAddress)
-	testAmount := big.NewInt(int64(TestAmount))
+	testAmount := testAmount
 	testNonce := big.NewInt(int64(TestNonce))
 
 	return types.EthereumEvent{EthereumChainID: testEthereumChainID,
@@ -69,7 +72,7 @@ func CreateTestProphecyClaimEvent(t *testing.T) types.ProphecyClaimEvent {
 	testEthereumReceiver := common.HexToAddress(TestEthereumAddress1)
 	testValidatorAddress := common.HexToAddress(TestEthereumAddress2)
 	testTokenAddress := common.HexToAddress(TestEthTokenAddress)
-	testAmount := big.NewInt(int64(TestAmount))
+	testAmount := testSDKAmount
 
 	return types.NewProphecyClaimEvent([]byte(TestCosmosAddress1), TestSymbol,
 		testProphecyID, testAmount, testEthereumReceiver, testValidatorAddress,
@@ -80,7 +83,7 @@ func CreateTestProphecyClaimEvent(t *testing.T) types.ProphecyClaimEvent {
 func CreateTestCosmosMsg(t *testing.T, claimType types.Event) types.CosmosMsg {
 	testCosmosSender := []byte(TestCosmosAddress1)
 	testEthereumReceiver := common.HexToAddress(TestEthereumAddress1)
-	testAmount := big.NewInt(int64(TestAmount))
+	testAmount := testSDKAmount
 
 	var symbol string
 	if claimType == types.MsgBurn {
@@ -91,7 +94,7 @@ func CreateTestCosmosMsg(t *testing.T, claimType types.Event) types.CosmosMsg {
 	}
 
 	// Create new Cosmos Msg
-	cosmosMsg := types.NewCosmosMsg(claimType, testCosmosSender, big.NewInt(int64(TestCosmosAddressSequence)),
+	cosmosMsg := types.NewCosmosMsg(claimType, testCosmosSender, big.NewInt(TestCosmosAddressSequence),
 		testEthereumReceiver, symbol, testAmount)
 
 	return cosmosMsg
@@ -134,7 +137,7 @@ func CreateCosmosMsgAttributes(t *testing.T, claimType types.Event) []tmKv.Pair
 	// (key, value) pairing for "amount" key
 	pairAmount := tmKv.Pair{
 		Key:   []byte("amount"),
-		Value: []byte(strconv.Itoa(TestAmount)),
+		Value: []byte(testAmount.String()),
 	}
 
 	// (key, value) pairing for "token_contract_address" key

cmd/ebrelayer/txs/types.go

@@ -4,6 +4,7 @@ import (
 	"math/big"
 
 	"github.com/Sifchain/sifnode/cmd/ebrelayer/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/ethereum/go-ethereum/common"
 )
 
@@ -17,9 +18,9 @@ type OracleClaim struct {
 // ProphecyClaim contains data required to make an ProphecyClaim
 type ProphecyClaim struct {
 	CosmosSender         []byte
-	CosmosSenderSequence *big.Int
 	Symbol               string
-	Amount               *big.Int
+	Amount               sdk.Int
 	EthereumReceiver     common.Address
 	ClaimType            types.Event
+	CosmosSenderSequence *big.Int
 }

cmd/ebrelayer/types/types.go

@@ -8,6 +8,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 
 	ethbridge "github.com/Sifchain/sifnode/x/ethbridge/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 // Event enum containing supported chain events
@@ -73,15 +74,15 @@ type ProphecyClaimEvent struct {
 	CosmosSender     []byte
 	Symbol           string
 	ProphecyID       *big.Int
-	Amount           *big.Int
+	Amount           sdk.Int
 	EthereumReceiver common.Address
 	ValidatorAddress common.Address
 	TokenAddress     common.Address
 	ClaimType        uint8
 }
 
 // NewProphecyClaimEvent creates a new ProphecyClaimEvent
-func NewProphecyClaimEvent(cosmosSender []byte, symbol string, prophecyID, amount *big.Int, ethereumReceiver,
+func NewProphecyClaimEvent(cosmosSender []byte, symbol string, prophecyID *big.Int, amount sdk.Int, ethereumReceiver,
 	validatorAddress, tokenAddress common.Address, claimType uint8) ProphecyClaimEvent {
 	return ProphecyClaimEvent{
 		CosmosSender:     cosmosSender,
@@ -108,14 +109,14 @@ type CosmosMsg struct {
 	CosmosSender         []byte
 	CosmosSenderSequence *big.Int
 	Symbol               string
-	Amount               *big.Int
+	Amount               sdk.Int
 	EthereumReceiver     common.Address
 	ClaimType            Event
 }
 
 // NewCosmosMsg creates a new CosmosMsg
 func NewCosmosMsg(claimType Event, cosmosSender []byte, cosmosSenderSequence *big.Int, ethereumReceiver common.Address, symbol string,
-	amount *big.Int) CosmosMsg {
+	amount sdk.Int) CosmosMsg {
 	return CosmosMsg{
 		ClaimType:            claimType,
 		CosmosSender:         cosmosSender,

deploy/rake/genesis.rake

@@ -38,8 +38,9 @@ namespace :genesis do
         puts "the file #{network_config(args[:chainnet])} does not exist!"
         exit(1)
       end
-
-      build_docker_image(args[:chainnet])
+      if args[:chainnet] != 'localnet'
+        build_docker_image(args[:chainnet])
+      end
       boot_docker_network(chainnet: args[:chainnet], seed_network_address: "192.168.2.0/24", eth_config: with_eth)
     end
 
@@ -50,25 +51,25 @@ namespace :genesis do
 
     desc "Reset the state of a network"
     task :reset, [:chainnet] do |t, args|
-      system("sifgen network reset #{args[:chainnet]} #{cwd}/../networks")
+      safe_system("sifgen network reset #{args[:chainnet]} #{cwd}/../networks")
     end
   end
 
   desc "node operations"
   namespace :sifnode do
     desc "Scaffold a new local node and configure it to connect to an existing network"
     task :scaffold, [:chainnet, :peer_address, :genesis_url] do |t, args|
-      system("sifgen node create #{args[:chainnet]} #{args[:peer_address]} #{args[:genesis_url]}")
+      safe_system("sifgen node create #{args[:chainnet]} #{args[:peer_address]} #{args[:genesis_url]}")
     end
 
     desc "boot scaffolded node and connect to existing network"
     task :boot do
-      system("sifnoded start --p2p.laddr tcp://0.0.0.0:26658 ")
+      safe_system("sifnoded start --p2p.laddr tcp://0.0.0.0:26658 ")
     end
 
     desc "Reset the state of a node"
     task :reset, [:chainnet, :node_directory] do |t, args|
-      system("sifgen node reset #{args[:chainnet]} #{args[:node_directory]}")
+      safe_system("sifgen node reset #{args[:chainnet]} #{args[:node_directory]}")
     end
   end
 end
@@ -83,7 +84,7 @@ end
 # @param network_config     Name of the file to use to output the config to
 #
 def network_create(chainnet:, validator_count:, build_dir:, seed_ip_address:, network_config:)
-  system("sifgen network create #{chainnet} #{validator_count} #{build_dir} #{seed_ip_address} #{network_config}")
+  safe_system("sifgen network create #{chainnet} #{validator_count} #{build_dir} #{seed_ip_address} #{network_config}")
 end
 
 #
@@ -101,9 +102,12 @@ def boot_docker_network(chainnet:, seed_network_address:, eth_config:)
   network.each_with_index do |node, idx|
     cmd += "MONIKER#{idx+1}=#{node['moniker']} MNEMONIC#{idx+1}=\"#{node['mnemonic']}\" IPV4_ADDRESS#{idx+1}=#{node['ipv4_address']} "
   end
-
-  cmd += "IPV4_SUBNET=#{seed_network_address} #{eth_config} docker-compose -f #{cwd}/../genesis/docker-compose.yml up #{instances} | tee #{cwd}/../../log/#{chainnet}.log"
-  system(cmd)
+  if chainnet == 'localnet'
+    cmd += "IPV4_SUBNET=#{seed_network_address} #{eth_config} docker-compose -f #{cwd}/../../test/integration/docker-compose-integration.yml up -d | tee #{cwd}/../../log/#{chainnet}.log"
+  else
+    cmd += "IPV4_SUBNET=#{seed_network_address} #{eth_config} docker-compose -f #{cwd}/../genesis/docker-compose.yml up #{instances} | tee #{cwd}/../../log/#{chainnet}.log"
+  end
+  safe_system(cmd)
 end
 
 #
@@ -112,7 +116,7 @@ end
 # @param chainnet Name or ID of the chain
 #
 def build_docker_image(chainnet)
-  system("docker build -f #{cwd}/../genesis/Dockerfile -t sifchain/sifnoded:#{chainnet} #{cwd}/../../")
+  safe_system("docker build -f #{cwd}/../genesis/Dockerfile -t sifchain/sifnoded:#{chainnet} #{cwd}/../../")
 end
 
 #

deploy/rake/helpers.rake

@@ -39,7 +39,11 @@ end
 # @params chainnet Name or ID of the chain
 #
 def network_config(chainnet)
-  "#{cwd}/../networks/#{Digest::SHA256.hexdigest chainnet}.yml"
+  if chainnet == 'localnet'
+    "#{cwd}/../networks/network-definition.yml"
+  else
+    "#{cwd}/../networks/#{Digest::SHA256.hexdigest chainnet}.yml"
+  end
 end
 
 #
@@ -79,3 +83,9 @@ def detect_os
   end
   )
 end
+
+def safe_system(cmd)
+  if (!system(cmd))
+    STDERR.puts("System cmd failed: #{cmd}")
+  end
+end