diff --git a/README.MD b/README.MD index 02ddd78..ffbac47 100644 --- a/README.MD +++ b/README.MD @@ -38,13 +38,17 @@ $ make 4. **escStartHeigh**t: listen from this height to get esc arbiter contract event -5. **escArbiterContractAddress**: arbiter contract address, if arbiter contract address changed, need to update it +5. **escTransactionManagerContractAddress**: esc transaction manager contract address -6. **escArbiterAddress**: arbiter wallet address, not operator address +6. **escArbiterManagerContractAddress**: esc arbiter manager contract address -7. **dataPath**: defines the path to record event file +7. **escConfigManagerContractAddress**: esc config manager contract address -8. **keyFilePath**: defines the path of arbiter BTC keystore and ESC keystore +8. **escArbiterAddress**: arbiter wallet address, not operator address + +9. **dataPath**: defines the path to record event file + +10. **keyFilePath**: defines the path of arbiter BTC keystore and ESC keystore ***config.yaml example***: @@ -60,7 +64,7 @@ $ make signer: true, network: "mainnet" escStartHeight: 21205821 - escArbiterContractAddress: "0xD206be45b53Fa5C2065049c7a70B1aa1755a9475" + escTransactionManagerContractAddress: "0xD206be45b53Fa5C2065049c7a70B1aa1755a9475" escArbiterManagerContractAddress: "0x54eE4fc8951A936b6AA02079B76c497c0471c52A" escConfigManagerContractAddress: "0x4421c63241A262C423277FFA82C376953072d25f" escArbiterAddress: "0x0262aB0ED65373cC855C34529fDdeAa0e686D913" diff --git a/app/arbiter/arbiter/arbiter.go b/app/arbiter/arbiter/arbiter.go index 5f9a2c8..b9eda44 100644 --- a/app/arbiter/arbiter/arbiter.go +++ b/app/arbiter/arbiter/arbiter.go @@ -96,7 +96,8 @@ func NewArbiter(ctx context.Context, config *config.Config, password string) *Ar func (v *Arbiter) Start() { if v.config.Signer { go v.processArbiterSig() - go v.processManualConfirm() + // temp we don't need to process manually confirm + // go v.processManualConfirm() } if v.config.Listener { @@ -514,12 +515,12 @@ func createDir(config *config.Config) error { } } - if !gfile.Exists(config.LoanManuallyConfirmedPath) { - err := gfile.Mkdir(config.LoanManuallyConfirmedPath) - if err != nil { - return err - } - } + // if !gfile.Exists(config.LoanManuallyConfirmedPath) { + // err := gfile.Mkdir(config.LoanManuallyConfirmedPath) + // if err != nil { + // return err + // } + // } if !gfile.Exists(config.LoanLogPath) { err := gfile.Mkdir(config.LoanLogPath) diff --git a/app/arbiter/config/config.go b/app/arbiter/config/config.go index 70cf349..8cfc4d5 100644 --- a/app/arbiter/config/config.go +++ b/app/arbiter/config/config.go @@ -8,13 +8,12 @@ type Config struct { Signer bool Listener bool - Http string - ESCStartHeight uint64 - ESCArbiterContractAddress string - ESCArbiterManagerContractAddress string - ESCConfigManagerContractAddress string - ESCOrderManagerContractAddress string - ESCArbiterAddress string + Http string + ESCStartHeight uint64 + ESCTransactionManagerContractAddress string + ESCArbiterManagerContractAddress string + ESCConfigManagerContractAddress string + ESCArbiterAddress string DataDir string EscKeyFilePath string diff --git a/app/arbiter/contract/contract_listener.go b/app/arbiter/contract/contract_listener.go index cb2403d..573ccf3 100644 --- a/app/arbiter/contract/contract_listener.go +++ b/app/arbiter/contract/contract_listener.go @@ -16,8 +16,7 @@ import ( ) type ContractListener struct { - loanContract common.Address - orderContract common.Address + loanContract common.Address queryClient *CrossClient listeneTopics []common.Hash @@ -26,13 +25,12 @@ type ContractListener struct { } func NewListener(ctx context.Context, client *CrossClient, - loanContract, orderContract common.Address, chan_event chan *events.ContractLogEvent) (*ContractListener, error) { + loanContract common.Address, chan_event chan *events.ContractLogEvent) (*ContractListener, error) { c := &ContractListener{ - queryClient: client, - loanContract: loanContract, - orderContract: orderContract, - ctx: ctx, - chan_events: chan_event, + queryClient: client, + loanContract: loanContract, + ctx: ctx, + chan_events: chan_event, } c.listeneTopics = make([]common.Hash, 0) return c, nil @@ -51,8 +49,9 @@ func (c *ContractListener) Start(startHeight uint64) (uint64, error) { distance := uint64(10000) toBlock := startHeight - // addresses := []common.Address{c.orderContract} - addresses := []common.Address{c.loanContract, c.orderContract} + addresses := []common.Address{c.loanContract} + // temp we don't need to listen order event + // addresses := []common.Address{c.loanContract, c.orderContract} loanQuery := c.queryClient.BuildQuery(addresses, c.listeneTopics, nil, nil) for i := startHeight; i <= endBlock-confirmBlocksCount; i += distance { if i+distance < endBlock { diff --git a/app/arbiter/contract/contract_main.go b/app/arbiter/contract/contract_main.go index dfaf190..c6494df 100644 --- a/app/arbiter/contract/contract_main.go +++ b/app/arbiter/contract/contract_main.go @@ -37,7 +37,6 @@ type ArbitratorContract struct { loanContract *common.Address arbiterManagerContract *common.Address configManagerContract *common.Address - orderManagerContract *common.Address cfg *config.Config logger *log.Logger @@ -68,13 +67,12 @@ func New(ctx context.Context, cfg *config.Config, privateKey string, logger *log if err != nil { return nil, err } - loanAddress := common.HexToAddress(cfg.ESCArbiterContractAddress) + loanAddress := common.HexToAddress(cfg.ESCTransactionManagerContractAddress) arbiterManagerAddress := common.HexToAddress(cfg.ESCArbiterManagerContractAddress) configManagerAddress := common.HexToAddress(cfg.ESCConfigManagerContractAddress) - orderManangerAddress := common.HexToAddress(cfg.ESCOrderManagerContractAddress) eventChan := make(chan *events.ContractLogEvent, 3) chan_interrupt := make(chan struct{}) - listener, err := NewListener(ctx, client, loanAddress, orderManangerAddress, eventChan) + listener, err := NewListener(ctx, client, loanAddress, eventChan) if err != nil { return nil, err } @@ -112,7 +110,6 @@ func New(ctx context.Context, cfg *config.Config, privateKey string, logger *log loanContract: &loanAddress, arbiterManagerContract: &arbiterManagerAddress, configManagerContract: &configManagerAddress, - orderManagerContract: &orderManangerAddress, cfg: cfg, logger: logger, } diff --git a/app/arbiter/main.go b/app/arbiter/main.go index 1caee62..254e8f3 100644 --- a/app/arbiter/main.go +++ b/app/arbiter/main.go @@ -86,7 +86,7 @@ func initConfig(ctx context.Context) *config.Config { g.Log().Error(ctx, "get escStartHeight config err:", err) os.Exit(1) } - escArbiterContractAddress, err := g.Cfg().Get(ctx, "arbiter.escArbiterContractAddress") + escTransactionManagerContractAddress, err := g.Cfg().Get(ctx, "arbiter.escTransactionManagerContractAddress") if err != nil { g.Log().Error(ctx, "get escArbiterAddress config err:", err) os.Exit(1) @@ -106,11 +106,6 @@ func initConfig(ctx context.Context) *config.Config { g.Log().Error(ctx, "get escArbiterAddress config err:", err) os.Exit(1) } - escOrderManagerAddress, err := g.Cfg().Get(ctx, "arbiter.escOrderManagerContractAddress") - if err != nil { - g.Log().Error(ctx, "get escOrderManagerAddress config err:", err) - os.Exit(1) - } gDataPath, err := g.Cfg().Get(ctx, "arbiter.dataPath") if err != nil { g.Log().Error(ctx, "get dataPath config err:", err) @@ -128,8 +123,9 @@ func initConfig(ctx context.Context) *config.Config { g.Log().Info(ctx, "listener:", listener) g.Log().Info(ctx, "http:", http) g.Log().Info(ctx, "escStartHeight:", escStartHeight) - g.Log().Info(ctx, "escArbiterContractAddress:", escArbiterContractAddress) + g.Log().Info(ctx, "escTransactionManagerContractAddress:", escTransactionManagerContractAddress) g.Log().Info(ctx, "escArbiterManagerAddress:", escArbiterManagerAddress) + g.Log().Info(ctx, "escConfigManagerAddress:", escConfigManagerAddress) g.Log().Info(ctx, "escArbiterAddress:", escArbiterAddress) g.Log().Info(ctx, "dataPath:", dataPath) g.Log().Info(ctx, "keyFilePath:", keyFilePath) @@ -146,16 +142,15 @@ func initConfig(ctx context.Context) *config.Config { LoanSignedEventPath := gfile.Join(dataPath, "loan_signed_event/") return &config.Config{ - Network: network.String(), - Signer: signer.Bool(), - Listener: listener.Bool(), - Http: http.String(), - ESCStartHeight: escStartHeight.Uint64(), - ESCArbiterContractAddress: escArbiterContractAddress.String(), - ESCArbiterManagerContractAddress: escArbiterManagerAddress.String(), - ESCConfigManagerContractAddress: escConfigManagerAddress.String(), - ESCOrderManagerContractAddress: escOrderManagerAddress.String(), - ESCArbiterAddress: escArbiterAddress.String(), + Network: network.String(), + Signer: signer.Bool(), + Listener: listener.Bool(), + Http: http.String(), + ESCStartHeight: escStartHeight.Uint64(), + ESCTransactionManagerContractAddress: escTransactionManagerContractAddress.String(), + ESCArbiterManagerContractAddress: escArbiterManagerAddress.String(), + ESCConfigManagerContractAddress: escConfigManagerAddress.String(), + ESCArbiterAddress: escArbiterAddress.String(), DataDir: dataPath, EscKeyFilePath: escKeyFilePath, diff --git a/app/arbiter/manifest/config/config.yaml b/app/arbiter/manifest/config/config.yaml index 3b910d2..54e75b7 100644 --- a/app/arbiter/manifest/config/config.yaml +++ b/app/arbiter/manifest/config/config.yaml @@ -7,11 +7,10 @@ arbiter: listener: true signer: true network: "mainnet" - escStartHeight: 29632056 - escArbiterContractAddress: "0x1f872A1fBc02A38B087DE6af2176ab0BC63a53d0" + escStartHeight: 29843440 + escTransactionManagerContractAddress: "0x1f872A1fBc02A38B087DE6af2176ab0BC63a53d0" escArbiterManagerContractAddress: "0x9963b5214434776D043A4e98Bc7f33321F6aaCfc" escConfigManagerContractAddress: "0x4421c63241A262C423277FFA82C376953072d25f" - escOrderManagerContractAddress: "0x1f00FEE6B4dbbc97B8c035E1813772C38E64081d" - escArbiterAddress: "0x3Cf0BB575527cACf9e274a6eE879f876Dae0BC40" + escArbiterAddress: "0x0262aB0ED65373cC855C34529fDdeAa0e686D913" dataPath: "./app/arbiter/data" keyFilePath: "./app/arbiter/data/keys/"