From b4c9320c88925e00452216af274417965e5fc70e Mon Sep 17 00:00:00 2001 From: goalongway Date: Thu, 26 Sep 2024 13:31:32 +0800 Subject: [PATCH] modify --- .gitignore | 4 +++- README.md | 24 ++++++++++++++++++++++++ applications/config/listener.yaml | 22 ++++++++++++---------- 3 files changed, 39 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index c73843ac..785ddc24 100644 --- a/.gitignore +++ b/.gitignore @@ -107,4 +107,6 @@ contracts/artifacts/* contracts/cache/* node_modules *-dev.yaml -.env \ No newline at end of file +.env +applications/env +.DS_Store diff --git a/README.md b/README.md index 47314a91..02acb869 100644 --- a/README.md +++ b/README.md @@ -222,6 +222,7 @@ database: loglevel: 4 # 1: Silent 2: Error 3: Warn 4: Info bitcoin: + status: false name: bitcoin chaintype: 2 chainid: 0 @@ -237,6 +238,7 @@ bitcoin: DisableTLS: false bsquared: + status: false name: bsquared chaintype: 1 mainnet: false @@ -248,6 +250,7 @@ bsquared: Builders: [ "0x0000000000000000000000000000000000000000000000000000000000000000" ] arbitrum: + status: false name: arbitrum chaintype: 1 chainid: 421614 @@ -297,6 +300,7 @@ APP_DATABASE_DBNAME=b2_message APP_DATABASE_LOGLEVEL=4 APP_BITCOIN_NAME=bitcoin +APP_BITCOIN_STATUS=true APP_BITCOIN_CHAINTYPE=2 APP_BITCOIN_CHAINID=0 APP_BITCOIN_MAINNET=false @@ -311,6 +315,7 @@ APP_BITCOIN_BTCPASS=test APP_BITCOIN_DISABLETLS=false APP_BSQUARED_NAME=bsquared +APP_BSQUARED_STATUS=true APP_BSQUARED_CHAINTYPE=1 APP_BSQUARED_MAINNET=false APP_BSQUARED_CHAINID=1123 @@ -321,6 +326,7 @@ APP_BSQUARED_BLOCKINTERVAL=2000 APP_BSQUARED_BUILDERS=0x0000000000000000000000000000000000000000000000000000000000000000 APP_ARBITRUM_NAME=arbitrum +APP_ARBITRUM_STATUS=true APP_ARBITRUM_CHAINTYPE=1 APP_ARBITRUM_CHAINID=421614 APP_ARBITRUM_MAINNET=false @@ -350,6 +356,7 @@ database: loglevel: 4 # 1: Silent 2: Error 3: Warn 4: Info bsquared: + status: false name: bsquared chaintype: 1 mainnet: false @@ -364,6 +371,7 @@ bsquared: Validators: [ "0x0000000000000000000000000000000000000000" ] arbitrum: + status: false name: arbitrum chaintype: 1 chainid: 421614 @@ -378,6 +386,7 @@ arbitrum: Validators: [ "0x0000000000000000000000000000000000000000" ] bitcoin: + status: false name: bitcoin chaintype: 2 chainid: 0 @@ -436,6 +445,7 @@ APP_DATABASE_DBNAME=b2_message APP_DATABASE_LOGLEVEL=4 APP_BSQUARED_NAME=bsquared +APP_BSQUARED_STATUS=true APP_BSQUARED_CHAINTYPE=1 APP_BSQUARED_MAINNET=false APP_BSQUARED_CHAINID=1123 @@ -449,6 +459,7 @@ APP_BSQUARED_SIGNATUREWEIGHT=1 APP_BSQUARED_VALIDATORS=0x0000000000000000000000000000000000000000 APP_ARBITRUM_NAME=arbitrum +APP_ARBITRUM_STATUS=true APP_ARBITRUM_CHAINTYPE=1 APP_ARBITRUM_CHAINID=421614 APP_ARBITRUM_MAINNET=false @@ -462,6 +473,7 @@ APP_ARBITRUM_SIGNATUREWEIGHT=1 APP_ARBITRUM_VALIDATORS=0x0000000000000000000000000000000000000000 APP_BITCOIN_NAME=bitcoin +APP_BITCOIN_STATUS=true APP_BITCOIN_CHAINTYPE=2 APP_BITCOIN_CHAINID=0 APP_BITCOIN_MAINNET=false @@ -497,6 +509,7 @@ log: level: 6 bsquared: + status: false name: bsquared chaintype: 1 mainnet: false @@ -510,6 +523,7 @@ bsquared: SignatureWeight: 1 arbitrum: + status: false name: arbitrum chaintype: 1 chainid: 421614 @@ -523,6 +537,7 @@ arbitrum: SignatureWeight: 1 bitcoin: + status: false name: bitcoin chaintype: 2 chainid: 0 @@ -574,6 +589,7 @@ APP_LOG_LEVEL=6 ./validator -f=validator APP_LOG_LEVEL=6 APP_BSQUARED_NAME=bsquared +APP_BSQUARED_STATUS=true APP_BSQUARED_CHAINTYPE=1 APP_BSQUARED_MAINNET=false APP_BSQUARED_CHAINID=1123 @@ -586,6 +602,7 @@ APP_BSQUARED_ENDPOINT=/ip4/127.0.0.1/tcp/20000/p2p/16Uiu2HAkwynt59WSsNRS9sk1aszg APP_BSQUARED_SIGNATUREWEIGHT=1 APP_ARBITRUM_NAME=arbitrum +APP_ARBITRUM_STATUS=true APP_ARBITRUM_CHAINTYPE=1 APP_ARBITRUM_CHAINID=421614 APP_ARBITRUM_MAINNET=false @@ -598,6 +615,7 @@ APP_ARBITRUM_ENDPOINT=/ip4/127.0.0.1/tcp/20001/p2p/16Uiu2HAkwynt59WSsNRS9sk1aszg APP_ARBITRUM_SIGNATUREWEIGHT=1 APP_BITCOIN_NAME=bitcoin +APP_BITCOIN_STATUS=true APP_BITCOIN_CHAINTYPE=2 APP_BITCOIN_CHAINID=0 APP_BITCOIN_MAINNET=false @@ -647,6 +665,7 @@ database: loglevel: 4 # 1: Silent 2: Error 3: Warn 4: Info bitcoin: + status: true name: bitcoin chaintype: 2 chainid: 0 @@ -662,6 +681,7 @@ bitcoin: DisableTLS: false bsquared: + status: true name: bsquared chaintype: 1 mainnet: false @@ -673,6 +693,7 @@ bsquared: Builders: [ "0x0000000000000000000000000000000000000000000000000000000000000000" ] arbitrum: + status: true name: arbitrum chaintype: 1 chainid: 421614 @@ -721,6 +742,7 @@ APP_DATABASE_DBNAME=b2_message APP_DATABASE_LOGLEVEL=4 APP_BITCOIN_NAME=bitcoin +APP_BITCOIN_STATUS=true APP_BITCOIN_CHAINTYPE=2 APP_BITCOIN_CHAINID=0 APP_BITCOIN_MAINNET=false @@ -735,6 +757,7 @@ APP_BITCOIN_BTCPASS=test APP_BITCOIN_DISABLETLS=false APP_BSQUARED_NAME=bsquared +APP_BSQUARED_STATUS=true APP_BSQUARED_CHAINTYPE=1 APP_BSQUARED_MAINNET=false APP_BSQUARED_CHAINID=1123 @@ -745,6 +768,7 @@ APP_BSQUARED_BLOCKINTERVAL=2000 APP_BSQUARED_BUILDERS=0x0000000000000000000000000000000000000000000000000000000000000000 APP_ARBITRUM_NAME=arbitrum +APP_ARBITRUM_STATUS=true APP_ARBITRUM_CHAINTYPE=1 APP_ARBITRUM_CHAINID=421614 APP_ARBITRUM_MAINNET=false diff --git a/applications/config/listener.yaml b/applications/config/listener.yaml index 8ad698b2..0915fb42 100644 --- a/applications/config/listener.yaml +++ b/applications/config/listener.yaml @@ -9,15 +9,17 @@ database: dbname: b2_message loglevel: 4 # 1: Silent 2: Error 3: Warn 4: Info +bridges: 1123:0xe55c8D6D7Ed466f66D136f29434bDB6714d8E3a5,421614:0x2A82058E46151E337Baba56620133FC39BD5B71F + bsquared: status: false name: bsquared chaintype: 1 mainnet: false chainid: 1123 - rpcurl: https://b2-testnet.alt.technology + rpcurl: 127.0.0.1:8081 safeblocknumber: 1 - ListenAddress: 0x5c2646996eEe3ECf865BEfA2De24e5BbE1C552Ba + ListenAddress: 0x0000000000000000000000000000000000000000 BlockInterval: 2000 arbitrum: @@ -26,9 +28,9 @@ arbitrum: chaintype: 1 chainid: 421614 mainnet: false - rpcurl: https://cosmological-green-spring.arbitrum-sepolia.quiknode.pro/e41990a3263b68eecb26a88d3b3122185798613e/ + rpcurl: 127.0.0.1:8082 safeblocknumber: 1 - ListenAddress: 0x2A82058E46151E337Baba56620133FC39BD5B71F + ListenAddress: 0x0000000000000000000000000000000000000000 BlockInterval: 100 bitcoin: @@ -37,20 +39,20 @@ bitcoin: chaintype: 2 chainid: 0 mainnet: false - rpcurl: 43.128.75.27:38332 #divine-patient-meadow.btc-testnet.quiknode.pro/36ade4989e57ddd507d9790dec479606cbe8c0c6 + rpcurl: 127.0.0.1:8083 safeblocknumber: 3 ListenAddress: muGFcyjuyURJJsXaLXHCm43jLBmGPPU7ME BlockInterval: 6000 ToChainId: 1123 - ToContractAddress: 0xAaF7f27EA526B29cF4dA3b957Ed0C388070FcCE5 - BtcUser: 121FhfhGrhxyq9rIGf - BtcPass: Z8slkhblO4xtqH8uK7 + ToContractAddress: 0x0000000000000000000000000000000000000000 + BtcUser: 000000000000000000 + BtcPass: 000000000000000000 DisableTLS: true particle: Url: https://rpc.particle.network/evm-chain ChainId: 1123 - ProjectUuid: 34c6b829-5b89-44e8-90a9-6d982787b9c9 - ProjectKey: c6Z44Ml4TQeNhctvwYgdSv6DBzfjf6t6CB0JDscR + ProjectUuid: 000000000000000000 + ProjectKey: 000000000000000000 AAPubKeyAPI: https://bridge-aa-dev.bsquared.network