Merge remote-tracking branch 'origin/main' into feat/sqc_rotation_suc…

…cess
dymensionxyz · Sep 12, 2024 · f360ae2 · f360ae2
2 parents e3d63e3 + ccba11d
commit f360ae2
Show file tree

Hide file tree

Showing 42 changed files with 410 additions and 373 deletions.
diff --git a/.github/ISSUE_TEMPLATE/e2e_test_case_template.yaml b/.github/ISSUE_TEMPLATE/e2e_test_case_template.yaml
@@ -70,6 +70,7 @@ body:
         - "full node sync"
         - "base layer disconnection"
         - "sequencer rotation"
+        - "light client"
     validations:
       required: true
 

diff --git a/.github/workflows/e2e-test-evm-workflow-call.yml b/.github/workflows/e2e-test-evm-workflow-call.yml
@@ -79,7 +79,7 @@ jobs:
             docker image ls -a
   
         - name: Rollapp-EVM E2E Tests
-          run: make e2e-test test=${{ matrix.test }}
+          run: sudo -E make e2e-test test=${{ matrix.test }} 
           env:
             ROLLAPP_EVM_CI: ${{ inputs.rollapp_evm_ci }}
             DYMENSION_CI: ${{ inputs.dymension_ci }}

diff --git a/.github/workflows/e2e-test-hub-upgrade-workflow-call.yml b/.github/workflows/e2e-test-hub-upgrade-workflow-call.yml
@@ -48,7 +48,7 @@ jobs:
           docker image ls -a
 
       - name: Upgrade Hub E2E Tests
-        run: make ${{ matrix.tests }}
+        run: sudo -E make ${{ matrix.tests }} 
         env:
           DYMENSION_CI: ${{ inputs.dymension_ci }}
           UPGRADE_NAME: ${{ inputs.upgrade_name }}

diff --git a/.github/workflows/e2e-test-rollapp-evm-upgrade-workflow-call.yml b/.github/workflows/e2e-test-rollapp-evm-upgrade-workflow-call.yml
@@ -53,7 +53,7 @@ jobs:
           docker image ls -a
 
       - name: Rollapp-EVM Upgrade E2E Tests
-        run: make ${{ matrix.tests }}
+        run: sudo -E make ${{ matrix.tests }}
         env:
           ROLLAPP_EVM_CI: ${{ inputs.rollapp_evm_ci }}
           UPGRADE_ROLLAPP_EVM_NAME: ${{ inputs.upgrade_name }}

diff --git a/.github/workflows/e2e-test-rollapp-wasm-upgrade-workflow-call.yml b/.github/workflows/e2e-test-rollapp-wasm-upgrade-workflow-call.yml
@@ -53,7 +53,7 @@ jobs:
           docker image ls -a
 
       - name: Rollapp-Wasm Upgrade E2E Tests
-        run: make ${{ matrix.tests }}
+        run: sudo -E make ${{ matrix.tests }} 
         env:
           ROLLAPP_WASM_CI: ${{ inputs.rollapp_wasm_ci }}
           UPGRADE_ROLLAPP_WASM_NAME: ${{ inputs.upgrade_name }}

diff --git a/.github/workflows/e2e-test-wasm-workflow-call.yaml b/.github/workflows/e2e-test-wasm-workflow-call.yaml
@@ -78,7 +78,7 @@ jobs:
             docker image ls -a
   
         - name: Rollapp-Wasm E2E Tests
-          run: make e2e-test test=${{ matrix.test }}
+          run: sudo -E make e2e-test test=${{ matrix.test }} 
           env:
             ROLLAPP_WASM_CI: ${{ inputs.rollapp_wasm_ci }}
             DYMENSION_CI: ${{ inputs.dymension_ci }}

diff --git a/.github/workflows/e2e-test-workflow-call.yml b/.github/workflows/e2e-test-workflow-call.yml
@@ -103,7 +103,7 @@ jobs:
           docker image ls -a
 
       - name: Rollapp-EVM E2E Tests
-        run: make e2e-test test=${{ matrix.test }}
+        run: sudo -E make e2e-test test=${{ matrix.test }} 
         env:
           DYMENSION_CI: ${{ inputs.dymension_ci }}
           ROLLAPP_EVM_CI: ${{ inputs.rollapp_evm_ci }}
@@ -140,7 +140,7 @@ jobs:
             docker image ls -a
   
         - name: Rollapp-Wasm E2E Tests
-          run: make e2e-test test=${{ matrix.test }}
+          run: sudo -E make e2e-test test=${{ matrix.test }} 
           env:
             DYMENSION_CI: ${{ inputs.dymension_ci }}
             ROLLAPP_EVM_CI: ${{ inputs.rollapp_evm_ci }}

diff --git a/.github/workflows/e2e_test.yml b/.github/workflows/e2e_test.yml
@@ -73,7 +73,7 @@ jobs:
           go-version: "1.21.4"
 
       - name: Rollapp-EVM E2E Tests
-        run: make e2e-test test=${{ matrix.test }}
+        run: sudo make e2e-test test=${{ matrix.test }}
 
   # e2e-tests-by runs the actual go test command to trigger the test.
   rollapp-wasm:
@@ -93,4 +93,4 @@ jobs:
             go-version: "1.21.4"
 
         - name: Rollapp-Wasm E2E Tests
-          run: make e2e-test test=${{ matrix.test }}
+          run: sudo make e2e-test test=${{ matrix.test }}
diff --git a/clean.sh b/clean.sh
@@ -5,5 +5,6 @@ rm -rf /tmp/rollapp*
 rm -rf /tmp/dym*
 rm -rf /tmp/sequencer*
 rm -rf /tmp/celes*
+rm -rf /tmp/gaia*
 echo "Clean success!!"
 
diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ replace (
 
 require (
 	github.com/decentrio/e2e-testing-live v0.0.0-20240718080249-ee255229c869
-	github.com/decentrio/rollup-e2e-testing v0.0.0-20240819021909-ed72d19525f5
+	github.com/decentrio/rollup-e2e-testing v0.0.0-20240911110829-da071a3f1628
 	github.com/dymensionxyz/dymension/v3 v3.1.0-rc03.0.20240717194206-54c0fca5fada
 	github.com/dymensionxyz/dymint v1.2.0-rc01
 )

diff --git a/go.sum b/go.sum
@@ -770,8 +770,8 @@ github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR
 github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U=
 github.com/decentrio/e2e-testing-live v0.0.0-20240718080249-ee255229c869 h1:qWpUYGOsrSC+1Vmd2TjhbsSpntvvx9PsX3AoeMunFxc=
 github.com/decentrio/e2e-testing-live v0.0.0-20240718080249-ee255229c869/go.mod h1:HZNYnPwmSxkwTPjSD5yolauc1Vx1ZzKL4FFMxTq4H5Y=
-github.com/decentrio/rollup-e2e-testing v0.0.0-20240819021909-ed72d19525f5 h1:L9qJ8GSybCBICakC9fSvoHmUvrpW0dbTUJjGtk+UmQ0=
-github.com/decentrio/rollup-e2e-testing v0.0.0-20240819021909-ed72d19525f5/go.mod h1:QmBrZgZplhtgHRWC0Z7LC7TDsKuC8sDyQvZyXXaqw/c=
+github.com/decentrio/rollup-e2e-testing v0.0.0-20240911110829-da071a3f1628 h1:BaQci/ieiQ7+N0sRouA+CznSzPDbOx+ae/LsgcCQgSs=
+github.com/decentrio/rollup-e2e-testing v0.0.0-20240911110829-da071a3f1628/go.mod h1:QmBrZgZplhtgHRWC0Z7LC7TDsKuC8sDyQvZyXXaqw/c=
 github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4=
 github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo=
 github.com/deckarep/golang-set/v2 v2.1.0 h1:g47V4Or+DUdzbs8FxCCmgb6VYd+ptPAngjM6dtGktsI=

diff --git a/live-tests/eibc_3rd_token_test.go b/live-tests/eibc_3rd_token_test.go
@@ -184,7 +184,7 @@ func TestEIBC_3rd_Token_RolY_Live(t *testing.T) {
 		re := regexp.MustCompile(`^\d+`)
 		if re.ReplaceAllString(eibcEvent.Price, "") == mochaIBCDenom && eibcEvent.PacketStatus == "PENDING" {
 			fmt.Println("EIBC Event:", eibcEvent)
-			_, err := cosmos.FullfillDemandOrder(&hub, eibcEvent.ID, marketMaker.Address, dymFee)
+			_, err := cosmos.FullfillDemandOrder(&hub, eibcEvent.OrderId, marketMaker.Address, dymFee)
 			require.NoError(t, err)
 		}
 	}
@@ -342,7 +342,7 @@ func TestEIBC_3rd_Token_Timeout_RolY_Live(t *testing.T) {
 		re := regexp.MustCompile(`^\d+`)
 		if re.ReplaceAllString(eibcEvent.Price, "") == mochaIBCDenom && eibcEvent.PacketStatus == "PENDING" {
 			fmt.Println("EIBC Event:", eibcEvent)
-			_, err := cosmos.FullfillDemandOrder(&hub, eibcEvent.ID, marketMaker.Address, dymFee)
+			_, err := cosmos.FullfillDemandOrder(&hub, eibcEvent.OrderId, marketMaker.Address, dymFee)
 			require.NoError(t, err)
 		}
 	}

diff --git a/live-tests/eibc_fulfillment_test.go b/live-tests/eibc_fulfillment_test.go
@@ -140,7 +140,7 @@ func TestEIBCFulfillRolX_Live(t *testing.T) {
 		re := regexp.MustCompile(`^\d+`)
 		if re.ReplaceAllString(eibcEvent.Price, "") == rollappXIBCDenom && eibcEvent.PacketStatus == "PENDING"{
 			fmt.Println("EIBC Event:", eibcEvent)
-			_, err := cosmos.FullfillDemandOrder(&hub, eibcEvent.ID, marketMaker.Address, dymFee)
+			_, err := cosmos.FullfillDemandOrder(&hub, eibcEvent.OrderId, marketMaker.Address, dymFee)
 			require.NoError(t, err)
 		}
 	}

diff --git a/live-tests/setup.go b/live-tests/setup.go
@@ -88,7 +88,7 @@ func encodingConfig() *util.TestEncodingConfig {
 }
 
 func getEibcEventFromTx(t *testing.T, dymension *cosmos.CosmosChain, txResp types.TxResponse) *dymensiontesting.EibcEvent {
-	const evType = "eibc"
+	const evType = "dymensionxyz.dymension.eibc.EventDemandOrderFulfilled"
 	events := txResp.Events
 
 	var (
@@ -100,10 +100,10 @@ func getEibcEventFromTx(t *testing.T, dymension *cosmos.CosmosChain, txResp type
 	)
 
 	eibcEvent := new(dymensiontesting.EibcEvent)
-	eibcEvent.ID = id
+	eibcEvent.OrderId = id
 	eibcEvent.Price = price
 	eibcEvent.Fee = fee
-	checkFulfilled, err := strconv.ParseBool(isFulfilled)
+	checkFulfilled, err := strconv.ParseBool(isFulfilled)         
 	if err != nil {
 		require.NoError(t, err)
 		return nil

diff --git a/tests/admc_test.go b/tests/admc_test.go
@@ -35,6 +35,8 @@ func TestADMC_Originates_HubtoRA_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
+	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
 	// Create chain factory with dymension
@@ -200,6 +202,8 @@ func TestADMC_Migrate_Empty_User_Memo_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
+	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
 	// Create chain factory with dymension
@@ -421,6 +425,8 @@ func TestADMC_Migrate_With_User_Memo_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
+	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
 	// Create chain factory with dymension
@@ -650,6 +656,8 @@ func TestADMC_Originates_HubtoRA_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
+	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
 	// Create chain factory with dymension
@@ -815,6 +823,8 @@ func TestADMC_Migrate_Empty_User_Memo_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
+	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
 	// Create chain factory with dymension
@@ -1033,6 +1043,8 @@ func TestADMC_Migrate_With_User_Memo_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
+	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
 	// Create chain factory with dymension
@@ -1258,6 +1270,8 @@ func TestADMC_MetaData_NotFound_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
+	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
 
@@ -1453,6 +1467,8 @@ func TestADMC_MetaData_NotFound_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
+	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
 

diff --git a/tests/automated_denommetadata_test.go b/tests/automated_denommetadata_test.go
@@ -1276,6 +1276,8 @@ func TestADMC_Hub_to_RA_Migrate_Dym_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
+	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
 	// Create chain factory with dymension
@@ -1466,6 +1468,8 @@ func TestADMC_Hub_to_RA_Migrate_Dym_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
+	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
 	// Create chain factory with dymension

diff --git a/tests/data/native_denom.json b/tests/data/native_denom.json
@@ -0,0 +1,5 @@
+{
+        "display":  "RAX",
+        "base":     "urax",
+        "exponent": 18
+}
diff --git a/tests/disconnection_test.go b/tests/disconnection_test.go
@@ -121,11 +121,13 @@ func TestDisconnection_EVM(t *testing.T) {
 	dymintTomlOverrides["settlement_gas_prices"] = "0adym"
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
-	dymintTomlOverrides["batch_submit_max_time"] = "5s"
+	dymintTomlOverrides["batch_submit_max_time"] = "20s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["block_batch_max_size_bytes"] = "1000"
-	dymintTomlOverrides["max_supported_batch_skew"] = "1"
+	dymintTomlOverrides["max_batch_skew"] = "1"
 	dymintTomlOverrides["batch_acceptance_attempts"] = "1"
 	dymintTomlOverrides["batch_acceptance_timeout"] = "5s"
+	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
 	// Create chain factory with dymension
@@ -194,6 +196,7 @@ func TestDisconnection_EVM(t *testing.T) {
 
 	// Wait for rollapp finalized
 	rollapp1Height, err := rollapp1.Height(ctx)
+	fmt.Println(rollapp1Height)
 	require.NoError(t, err)
 	dymension.WaitUntilRollappHeightIsFinalized(ctx, rollapp1.GetChainID(), rollapp1Height, 300)
 
@@ -203,13 +206,15 @@ func TestDisconnection_EVM(t *testing.T) {
 
 		// Wait until rollapp stops produce block
 		rollappHeight, err := rollapp1.Height(ctx)
+		fmt.Println(rollappHeight)
 		require.NoError(t, err)
 
 		err = testutil.WaitForCondition(
 			time.Minute*10,
 			time.Second*5, // each epoch is 5 seconds
 			func() (bool, error) {
 				newRollappHeight, err := rollapp1.Height(ctx)
+				fmt.Println(newRollappHeight)
 				require.NoError(t, err)
 
 				if newRollappHeight > rollappHeight {
@@ -247,10 +252,12 @@ func TestDisconnection_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "5s"
+	dymintTomlOverrides["batch_submit_time"] = "5s"
 	dymintTomlOverrides["block_batch_max_size_bytes"] = "1000"
-	dymintTomlOverrides["max_supported_batch_skew"] = "1"
+	dymintTomlOverrides["max_batch_skew"] = "1"
 	dymintTomlOverrides["batch_acceptance_attempts"] = "1"
 	dymintTomlOverrides["batch_acceptance_timeout"] = "5s"
+	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
 	// Create chain factory with dymension

diff --git a/tests/eibc_ack_error_test.go b/tests/eibc_ack_error_test.go
@@ -390,7 +390,7 @@ func TestEIBC_AckError_Dym_EVM(t *testing.T) {
 		require.NoError(t, err)
 
 		// fulfill demand order
-		txhash, err := dymension.FullfillDemandOrder(ctx, eibcEvents[len(eibcEvents)-1].ID, marketMakerAddr, eibcFee)
+		txhash, err := dymension.FullfillDemandOrder(ctx, eibcEvents[len(eibcEvents)-1].OrderId, marketMakerAddr, eibcFee)
 		require.NoError(t, err)
 		fmt.Println(txhash)
 		// eibcEvent := getEibcEventFromTx(t, dymension, txhash)
@@ -757,7 +757,7 @@ func TestEIBC_AckError_RA_Token_EVM(t *testing.T) {
 		require.Equal(t, eibcEvents[len(eibcEvents)-1].PacketStatus, "PENDING")
 
 		// fulfill demand order
-		txhash, err := dymension.FullfillDemandOrder(ctx, eibcEvents[len(eibcEvents)-1].ID, marketMakerAddr, eibcFee)
+		txhash, err := dymension.FullfillDemandOrder(ctx, eibcEvents[len(eibcEvents)-1].OrderId, marketMakerAddr, eibcFee)
 		require.NoError(t, err)
 		fmt.Println(txhash)
 		// eibcEvent := getEibcEventFromTx(t, dymension, txhash)
@@ -1194,7 +1194,7 @@ func TestEIBC_AckError_3rd_Party_Token_EVM(t *testing.T) {
 		require.Equal(t, eibcEvents[len(eibcEvents)-1].PacketStatus, "PENDING")
 
 		// fulfill demand order
-		txhash, err := dymension.FullfillDemandOrder(ctx, eibcEvents[len(eibcEvents)-1].ID, marketMakerAddr, eibcFee)
+		txhash, err := dymension.FullfillDemandOrder(ctx, eibcEvents[len(eibcEvents)-1].OrderId, marketMakerAddr, eibcFee)
 		require.NoError(t, err)
 		fmt.Println(txhash)
 		// eibcEvent := getEibcEventFromTx(t, dymension, txhash)
@@ -1589,7 +1589,7 @@ func TestEIBC_AckError_Dym_Wasm(t *testing.T) {
 		require.NoError(t, err)
 
 		// fulfill demand order
-		txhash, err := dymension.FullfillDemandOrder(ctx, eibcEvents[len(eibcEvents)-1].ID, marketMakerAddr, eibcFee)
+		txhash, err := dymension.FullfillDemandOrder(ctx, eibcEvents[len(eibcEvents)-1].OrderId, marketMakerAddr, eibcFee)
 		require.NoError(t, err)
 		fmt.Println(txhash)
 		// eibcEvent := getEibcEventFromTx(t, dymension, txhash)
@@ -1952,7 +1952,7 @@ func TestEIBC_AckError_RA_Token_Wasm(t *testing.T) {
 		require.Equal(t, eibcEvents[len(eibcEvents)-1].PacketStatus, "PENDING")
 
 		// fulfill demand order
-		txhash, err := dymension.FullfillDemandOrder(ctx, eibcEvents[len(eibcEvents)-1].ID, marketMakerAddr, eibcFee)
+		txhash, err := dymension.FullfillDemandOrder(ctx, eibcEvents[len(eibcEvents)-1].OrderId, marketMakerAddr, eibcFee)
 		require.NoError(t, err)
 		fmt.Println(txhash)
 		// eibcEvent := getEibcEventFromTx(t, dymension, txhash)
@@ -2341,7 +2341,7 @@ func TestEIBC_AckError_3rd_Party_Token_Wasm(t *testing.T) {
 		require.Equal(t, eibcEvents[len(eibcEvents)-1].PacketStatus, "PENDING")
 
 		// fulfill demand order
-		txhash, err := dymension.FullfillDemandOrder(ctx, eibcEvents[len(eibcEvents)-1].ID, marketMakerAddr, eibcFee)
+		txhash, err := dymension.FullfillDemandOrder(ctx, eibcEvents[len(eibcEvents)-1].OrderId, marketMakerAddr, eibcFee)
 		require.NoError(t, err)
 		fmt.Println(txhash)
 		// eibcEvent := getEibcEventFromTx(t, dymension, txhash)

diff --git a/tests/eibc_corrupted_memo_test.go b/tests/eibc_corrupted_memo_test.go
@@ -38,6 +38,8 @@ func TestEIBCCorruptedMemoNegative_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
+	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides