From bf599e6616eb29dd917f726ef9c7cdd982850398 Mon Sep 17 00:00:00 2001 From: Iulian Pascalau Date: Wed, 2 Oct 2024 18:55:06 +0300 Subject: [PATCH] - integrated the new version of the price aggregator contract --- .../slowTests/framework/multiversxHandler.go | 2 +- .../relayers/slowTests/framework/testSetup.go | 2 +- .../multiversx-price-aggregator-sc.abi.json | 22 ++++++++++++------ .../mvx/multiversx-price-aggregator-sc.wasm | Bin 19333 -> 24954 bytes 4 files changed, 17 insertions(+), 9 deletions(-) mode change 100644 => 100755 integrationTests/relayers/slowTests/testdata/contracts/mvx/multiversx-price-aggregator-sc.wasm diff --git a/integrationTests/relayers/slowTests/framework/multiversxHandler.go b/integrationTests/relayers/slowTests/framework/multiversxHandler.go index 35878073..07d861ef 100644 --- a/integrationTests/relayers/slowTests/framework/multiversxHandler.go +++ b/integrationTests/relayers/slowTests/framework/multiversxHandler.go @@ -139,7 +139,7 @@ func (handler *MultiversxHandler) deployContracts(ctx context.Context) { hex.EncodeToString([]byte("EGLD")), hex.EncodeToString(stakeValue.Bytes()), "01", - "03", + "02", "03", } diff --git a/integrationTests/relayers/slowTests/framework/testSetup.go b/integrationTests/relayers/slowTests/framework/testSetup.go index 15fc563e..e395e948 100644 --- a/integrationTests/relayers/slowTests/framework/testSetup.go +++ b/integrationTests/relayers/slowTests/framework/testSetup.go @@ -22,7 +22,7 @@ const ( proxyCacherExpirationSeconds = 600 proxyMaxNoncesDelta = 7 NumRelayers = 3 - NumOracles = 4 + NumOracles = 3 quorum = "03" ) diff --git a/integrationTests/relayers/slowTests/testdata/contracts/mvx/multiversx-price-aggregator-sc.abi.json b/integrationTests/relayers/slowTests/testdata/contracts/mvx/multiversx-price-aggregator-sc.abi.json index e68a5a84..112ce329 100644 --- a/integrationTests/relayers/slowTests/testdata/contracts/mvx/multiversx-price-aggregator-sc.abi.json +++ b/integrationTests/relayers/slowTests/testdata/contracts/mvx/multiversx-price-aggregator-sc.abi.json @@ -1,20 +1,20 @@ { "buildInfo": { "rustc": { - "version": "1.80.0-nightly", - "commitHash": "791adf759cc065316f054961875052d5bc03e16c", - "commitDate": "2024-05-21", - "channel": "Nightly", - "short": "rustc 1.80.0-nightly (791adf759 2024-05-21)" + "version": "1.78.0", + "commitHash": "9b00956e56009bab2aa15d7bff10916599e3d6d6", + "commitDate": "2024-04-29", + "channel": "Stable", + "short": "rustc 1.78.0 (9b00956e5 2024-04-29)" }, "contractCrate": { "name": "multiversx-price-aggregator-sc", "version": "0.47.1", - "gitVersion": "v0.45.2.1-reproducible-337-g5478c6e" + "gitVersion": "v0.45.2.1-reproducible-361-g5e42362" }, "framework": { "name": "multiversx-sc", - "version": "0.51.1" + "version": "0.53.2" } }, "name": "PriceAggregator", @@ -354,6 +354,14 @@ } ], "events": [ + { + "identifier": "pauseContract", + "inputs": [] + }, + { + "identifier": "unpauseContract", + "inputs": [] + }, { "identifier": "new_round", "inputs": [ diff --git a/integrationTests/relayers/slowTests/testdata/contracts/mvx/multiversx-price-aggregator-sc.wasm b/integrationTests/relayers/slowTests/testdata/contracts/mvx/multiversx-price-aggregator-sc.wasm old mode 100644 new mode 100755 index 0706295871e3b3d7bd11564a19f44e9ead92a71f..dea6107ba05cd930f6a129a40e0caf5b8e56adf7 GIT binary patch literal 24954 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 TWh{(SL3Z!0wKTaHo5KGC`)Z$| literal 19333 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