Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Config Change] Remove IPFS support #2636

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[Config Change] Remove IPFS support #2636

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e1bd2ce
Remove IPFS support
ganeshvanahalli Sep 5, 2024
347b43e
Merge branch 'master' into remove-ipfs-support
ganeshvanahalli Sep 6, 2024
644bac6
merge master and resolve conflicts
ganeshvanahalli Sep 12, 2024
c5ee343
Merge branch 'master' into remove-ipfs-support
tsahee Sep 16, 2024
32bed51
Merge branch 'master' into remove-ipfs-support
ganeshvanahalli Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 10 additions & 17 deletions cmd/conf/chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,23 +52,19 @@ func (c *ParentChainConfig) Validate() error {
}

type L2Config struct {
ID uint64 `koanf:"id"`
Name string `koanf:"name"`
InfoFiles []string `koanf:"info-files"`
InfoJson string `koanf:"info-json"`
DevWallet genericconf.WalletConfig `koanf:"dev-wallet"`
InfoIpfsUrl string `koanf:"info-ipfs-url"`
InfoIpfsDownloadPath string `koanf:"info-ipfs-download-path"`
ID uint64 `koanf:"id"`
Name string `koanf:"name"`
InfoFiles []string `koanf:"info-files"`
InfoJson string `koanf:"info-json"`
DevWallet genericconf.WalletConfig `koanf:"dev-wallet"`
}

var L2ConfigDefault = L2Config{
ID: 0,
Name: "",
InfoFiles: []string{}, // Default file used is chaininfo/arbitrum_chain_info.json, stored in DefaultChainInfo in chain_info.go
InfoJson: "",
DevWallet: genericconf.WalletConfigDefault,
InfoIpfsUrl: "",
InfoIpfsDownloadPath: "/tmp/",
ID: 0,
Name: "",
InfoFiles: []string{}, // Default file used is chaininfo/arbitrum_chain_info.json, stored in DefaultChainInfo in chain_info.go
InfoJson: "",
DevWallet: genericconf.WalletConfigDefault,
}

func L2ConfigAddOptions(prefix string, f *flag.FlagSet) {
Expand All @@ -79,9 +75,6 @@ func L2ConfigAddOptions(prefix string, f *flag.FlagSet) {

// Dev wallet does not exist unless specified
genericconf.WalletConfigAddOptions(prefix+".dev-wallet", f, "")
f.String(prefix+".info-ipfs-url", L2ConfigDefault.InfoIpfsUrl, "url to download chain info file")
f.String(prefix+".info-ipfs-download-path", L2ConfigDefault.InfoIpfsDownloadPath, "path to save temp downloaded file")
ganeshvanahalli marked this conversation as resolved.
Show resolved Hide resolved

}

func (c *L2Config) ResolveDirectoryNames(chain string) {
Expand Down
281 changes: 0 additions & 281 deletions cmd/ipfshelper/ipfshelper.bkup_go
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions cmd/ipfshelper/ipfshelper_stub.go
View file
Open in desktop

This file was deleted.

Loading
Loading