Wait for valid start time to submit (#919)

* Wait for valid start time to submit * Update e2e workflow docker command
LimeChain · Jan 6, 2025 · e78102d · e78102d
1 parent 0861c1c
commit e78102d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/.github/workflows/run-e2e.yaml b/.github/workflows/run-e2e.yaml
@@ -44,7 +44,7 @@ jobs:
         run: |
           echo "${{ secrets.E2E_DAVE_CONFIG }}" > ./examples/three-validators/dave/config/node.yml
       - name: Build the stack
-        run: cd examples/three-validators; docker-compose up -d
+        run: cd examples/three-validators; docker compose up -d
       - name: Perform health check on nodes
         shell: bash
         run: >
@@ -72,10 +72,10 @@ jobs:
         if: ${{ always() }}
         run: |
           cd examples/three-validators/ && mkdir logs &&
-          touch ./logs/alice.log && docker-compose logs alice > ./logs/alice.log &&
-          touch ./logs/bob.log && docker-compose logs bob > ./logs/bob.log &&
-          touch ./logs/carol.log && docker-compose logs carol > ./logs/carol.log &&
-          touch ./logs/dave.log && docker-compose logs dave_read_only > ./logs/dave.log
+          touch ./logs/alice.log && docker compose logs alice > ./logs/alice.log &&
+          touch ./logs/bob.log && docker compose logs bob > ./logs/bob.log &&
+          touch ./logs/carol.log && docker compose logs carol > ./logs/carol.log &&
+          touch ./logs/dave.log && docker compose logs dave_read_only > ./logs/dave.log
       - name: Upload Logs
         if: ${{ always() }}
         uses: actions/upload-artifact@v2

diff --git a/scripts/common/submit/submit-transaction.go b/scripts/common/submit/submit-transaction.go
@@ -20,6 +20,8 @@ import (
 	"encoding/hex"
 	"flag"
 	"fmt"
+	"time"
+
 	"github.com/hashgraph/hedera-sdk-go/v2"
 	"github.com/limechain/hedera-eth-bridge-validator/scripts/client"
 )
@@ -42,37 +44,29 @@ func main() {
 	if err != nil {
 		panic(fmt.Sprintf("failed to parse transaction. err [%s]", err))
 	}
-
+	waitForTransactionStart(deserialized)
 	var transactionResponse hedera.TransactionResponse
 	switch tx := deserialized.(type) {
 	case hedera.TransferTransaction:
 		transactionResponse, err = tx.Execute(client)
-		break
 	case hedera.TopicUpdateTransaction:
 		transactionResponse, err = tx.Execute(client)
-		break
 	case hedera.TokenUpdateTransaction:
 		transactionResponse, err = tx.Execute(client)
-		break
 	case hedera.AccountUpdateTransaction:
 		transactionResponse, err = tx.Execute(client)
-		break
 	case hedera.TokenCreateTransaction:
 		fmt.Println(tx)
 		transactionResponse, err = tx.Execute(client)
-		break
 	case hedera.TokenMintTransaction:
 		fmt.Println(tx)
 		transactionResponse, err = tx.Execute(client)
-		break
 	case hedera.TokenAssociateTransaction:
 		fmt.Println(tx)
 		transactionResponse, err = tx.Execute(client)
-		break
 	case hedera.TopicMessageSubmitTransaction:
 		fmt.Println(tx)
 		transactionResponse, err = tx.Execute(client)
-		break
 	default:
 		panic("invalid tx type provided")
 	}
@@ -100,3 +94,11 @@ func validateParams(transaction *string, privateKey *string, accountID *string)
 		panic("Account id was not provided")
 	}
 }
+
+func waitForTransactionStart(deserializedTx interface{}) {
+	tx := deserializedTx.(hedera.TransferTransaction)
+	validStart := tx.Transaction.GetTransactionID().ValidStart
+	waitTime := time.Until(*validStart)
+	fmt.Printf("Transaction will be excuted after: %v\n", waitTime)
+	time.Sleep(waitTime)
+}