Merge pull request #450 from ambrosus/dev

bump geth

contracts/configs/legacy/test.json

@@ -30,12 +30,12 @@
         "bsc": "0x5B7eC4D70Df5Cc1e4E5dFF97b0d9aCc35908C33f",
         "eth": "0x5731311327A62B67E25a4d99270483bf35F46Ab4"
       },
-      "nativeAnalog": ""
+      "nativeAnalog": "AMB"
     },
     "SAMB2": {
       "isActive": true,
-      "name": "Synthetic Amber 2",
-      "symbol": "SAMB2",
+      "name": "Synthetic Amber",
+      "symbol": "SAMB",
       "denomination": 18,
       "decimals": {
         "amb": 18,
@@ -54,7 +54,7 @@
       "nativeAnalog": "AMB"
     },
     "WETH": {
-      "isActive": false,
+      "isActive": true,
       "name": "Wrapped Ether",
       "symbol": "WETH",
       "denomination": 18,
@@ -67,13 +67,13 @@
         "eth"
       ],
       "addresses": {
-        "amb": "",
+        "amb": "0xFB8cB8084C428345555E630c0FB0d86A7D033045",
         "eth": "0x5ECfeaD3d77F6814D189F6209ea27eCD1c00D45a"
       },
       "nativeAnalog": "ETH"
     },
     "WBNB": {
-      "isActive": false,
+      "isActive": true,
       "name": "Wrapped BNB",
       "symbol": "WBNB",
       "denomination": 18,
@@ -86,7 +86,7 @@
         "bsc"
       ],
       "addresses": {
-        "amb": "",
+        "amb": "0x7809b228731E144f243b3Bb79441938aa0885506",
         "bsc": "0x3050A5cBe1ec89917933476a99962A40e802B89C"
       },
       "nativeAnalog": "BNB"
@@ -155,4 +155,4 @@
       "nativeAnalog": ""
     }
   }
-}
+}

contracts/configs/test.json

@@ -60,13 +60,13 @@
       }
     },
     "WETH": {
-      "isActive": false,
+      "isActive": true,
       "name": "Wrapped Ether",
       "symbol": "WETH",
       "logo": "https://ethereum.org/static/bfc04ac72981166c740b189463e1f74c/448ee/eth-diamond-black-white.webp",
       "networks": {
         "amb": {
-          "address": "",
+          "address": "0xFB8cB8084C428345555E630c0FB0d86A7D033045",
           "denomination": 18,
           "isPrimary": false
         },
@@ -79,13 +79,13 @@
       }
     },
     "WBNB": {
-      "isActive": false,
+      "isActive": true,
       "name": "Wrapped BNB",
       "symbol": "WBNB",
       "logo": "https://bscscan.com/token/images/binance_32.png",
       "networks": {
         "amb": {
-          "address": "",
+          "address": "0x7809b228731E144f243b3Bb79441938aa0885506",
           "denomination": 18,
           "isPrimary": false
         },

contracts/scripts/legacy_config.ts

@@ -65,4 +65,4 @@ function mapToLegacyToken(newToken: Token) {
   return legacyToken;
 }
 
-mapToLegacyConfig("main")
+mapToLegacyConfig("test")

relay/go.mod

@@ -5,7 +5,8 @@ go 1.18
 require (
 	github.com/avast/retry-go v3.0.0+incompatible
 	github.com/bnb-chain/tss-lib v1.3.5
-	github.com/ethereum/go-ethereum v1.11.5
+	github.com/distributed-lab/tron-sdk v0.1.0
+	github.com/ethereum/go-ethereum v1.13.14
 	github.com/golang/mock v1.4.4
 	github.com/gorilla/websocket v1.4.2
 	github.com/kofalt/go-memoize v0.0.0-20210721235729-46a601ff34b8
@@ -15,64 +16,93 @@ require (
 	github.com/shopspring/decimal v1.3.1
 	github.com/slok/go-http-metrics v0.10.0
 	github.com/spf13/viper v1.10.1
-	github.com/stretchr/testify v1.8.0
-	golang.org/x/exp v0.0.0-20230206171751-46f607a40771
-	golang.org/x/sync v0.1.0
-	golang.org/x/time v0.2.0
+	github.com/stretchr/testify v1.8.4
+	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
+	golang.org/x/sync v0.5.0
+	golang.org/x/time v0.3.0
 )
 
 require (
-	github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
+	github.com/Groestlcoin/go-groestl-hash v0.0.0-20181012171753-790653ac190c // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/StackExchange/wmi v1.2.1 // indirect
 	github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/bits-and-blooms/bitset v1.10.0 // indirect
 	github.com/btcsuite/btcd v0.0.0-20190629003639-c26ffa870fd8 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
 	github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/consensys/bavard v0.1.13 // indirect
+	github.com/consensys/gnark-crypto v0.12.1 // indirect
+	github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dchest/blake256 v1.0.0 // indirect
+	github.com/deckarep/golang-set v1.8.0 // indirect
 	github.com/deckarep/golang-set/v2 v2.1.0 // indirect
 	github.com/decred/dcrd/dcrec/edwards/v2 v2.0.0 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
+	github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
+	github.com/fbsobreira/gotron-sdk v0.0.0-20230714102740-d3204bd08259 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-ole/go-ole v1.2.1 // indirect
-	github.com/go-stack/stack v1.8.1 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-multierror v1.0.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/holiman/uint256 v1.2.0 // indirect
+	github.com/holiman/uint256 v1.2.4 // indirect
 	github.com/ipfs/go-log v0.0.1 // indirect
 	github.com/magiconair/properties v1.8.5 // indirect
+	github.com/martinboehm/btcutil v0.0.0-20211010173611-6ef1889c1819 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.4.3 // indirect
+	github.com/mmcloughlin/addchain v0.4.0 // indirect
 	github.com/opentracing/opentracing-go v1.1.0 // indirect
 	github.com/otiai10/primes v0.0.0-20180210170552-f6d2a1ba97c4 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
+	github.com/pborman/uuid v1.2.1 // indirect
 	github.com/pelletier/go-toml v1.9.4 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
 	github.com/prometheus/common v0.39.0 // indirect
 	github.com/prometheus/procfs v0.9.0 // indirect
+	github.com/rjeczalik/notify v0.9.3 // indirect
+	github.com/shengdoushi/base58 v1.0.0 // indirect
 	github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/afero v1.6.0 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.2.0 // indirect
-	github.com/tklauser/go-sysconf v0.3.5 // indirect
-	github.com/tklauser/numcpus v0.2.2 // indirect
+	github.com/supranational/blst v0.3.11 // indirect
+	github.com/tklauser/go-sysconf v0.3.12 // indirect
+	github.com/tklauser/numcpus v0.6.1 // indirect
+	github.com/tyler-smith/go-bip39 v1.1.0 // indirect
 	github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc // indirect
-	golang.org/x/crypto v0.1.0 // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	golang.org/x/text v0.7.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	gitlab.com/distributed_lab/logan v3.8.1+incompatible // indirect
+	go.uber.org/atomic v1.6.0 // indirect
+	go.uber.org/multierr v1.5.0 // indirect
+	go.uber.org/zap v1.15.0 // indirect
+	golang.org/x/crypto v0.17.0 // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/net v0.18.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/tools v0.15.0 // indirect
+	google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
+	google.golang.org/grpc v1.57.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/ini.v1 v1.66.2 // indirect
-	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	rsc.io/tmplfunc v0.0.3 // indirect
 )