-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #45 from icon-project/bgkwon-refactoring-relay
Refactoring relay and fix bugs in relay
- Loading branch information
Showing
29 changed files
with
1,152 additions
and
797 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| package ethbr | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "os" | ||
|
|
||
| "github.com/icon-project/btp2/chain" | ||
| "github.com/icon-project/btp2/common/link" | ||
| "github.com/icon-project/btp2/common/log" | ||
| "github.com/icon-project/btp2/common/types" | ||
| "github.com/icon-project/btp2/common/wallet" | ||
| ) | ||
|
|
||
| const TYPE = "eth-bridge" | ||
|
|
||
| func RegisterEthBridge() { | ||
| link.RegisterFactory(&link.Factory{ | ||
| Type: TYPE, | ||
| ParseChainConfig: ParseChainConfig, | ||
| NewReceiver: NewReceiver, | ||
| NewSender: NewSender, | ||
| }) | ||
| } | ||
|
|
||
| func ParseChainConfig(raw json.RawMessage) (link.ChainConfig, error) { | ||
| cfg := chain.BaseConfig{} | ||
| if err := json.Unmarshal(raw, &cfg); err != nil { | ||
| return nil, err | ||
| } | ||
| if cfg.Type != TYPE { | ||
| return nil, fmt.Errorf("invalid type (type:%s)", cfg.Type) | ||
| } | ||
| return cfg, nil | ||
| } | ||
|
|
||
| func NewReceiver(srcCfg link.ChainConfig, dstAddr types.BtpAddress, baseDir string, l log.Logger) (link.Receiver, error) { | ||
| src := srcCfg.(chain.BaseConfig) | ||
|
|
||
| return newEthBridge(srcCfg, dstAddr, src.Endpoint, l, baseDir, src.Options) | ||
| } | ||
|
|
||
| func NewSender(srcAddr types.BtpAddress, dstCfg link.ChainConfig, l log.Logger) (types.Sender, error) { | ||
| dst := dstCfg.(chain.BaseConfig) | ||
| w, err := newWallet(dst.KeyStorePass, dst.KeySecret, dst.KeyStore) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return newSender(srcAddr, dst, w, dst.Endpoint, dst.Options, l), nil | ||
| } | ||
|
|
||
| func newWallet(passwd, secret string, keyStorePath string) (types.Wallet, error) { | ||
| if keyStore, err := os.ReadFile(keyStorePath); err != nil { | ||
| return nil, fmt.Errorf("fail to open KeyStore file path=%s", keyStorePath) | ||
| } else { | ||
| pw, err := resolvePassword(secret, passwd) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return wallet.DecryptKeyStore(keyStore, pw) | ||
| } | ||
| } | ||
|
|
||
| func resolvePassword(keySecret, keyStorePass string) ([]byte, error) { | ||
| if keySecret != "" { | ||
| return os.ReadFile(keySecret) | ||
| } else { | ||
| if keyStorePass != "" { | ||
| return []byte(keyStorePass), nil | ||
| } | ||
| } | ||
| return nil, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.