From 5dfbfab389e0d7ccbc61f06df0ba59664a5975d2 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 6 Jun 2019 12:03:02 -0500 Subject: [PATCH 01/12] compleation for rmtx --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index 9a804c9..276d385 100644 --- a/main.go +++ b/main.go @@ -107,7 +107,7 @@ func main() { "unlockwallet": unlockwallet.completion, "newtx": newtx.completion, - "rmtx": complete.Command{}, + "rmtx": rmtx.completion, "listtxs": listtxs.completion, "addtxinput": addtxinput.completion, "addtxoutput": addtxoutput.completion, From 7d8060f142f683677147892627ca7cf9e9b8eff3 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 7 Jun 2019 09:55:46 -0500 Subject: [PATCH 02/12] comment formatting --- main.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/main.go b/main.go index 276d385..7745763 100644 --- a/main.go +++ b/main.go @@ -142,7 +142,7 @@ func main() { // strings filename := util.ConfigFilename() - //instead of giving warnings, check that the file exists before attempting + // instead of giving warnings, check that the file exists before attempting // to read it. if _, err := os.Stat(filename); err == nil { cfg := util.ReadConfig(filename) @@ -173,7 +173,7 @@ func main() { } } - //if a config file is found, and the wallet will start with TLS, + // if a config file is found, and the wallet will start with TLS, // factom-cli should use TLS too if cfg.Walletd.WalletTlsEnabled == true { *walletTLSflag = true @@ -187,7 +187,7 @@ func main() { } } - //if a config file is found, and the factomd will start with TLS, + // if a config file is found, and the factomd will start with TLS, // factom-cli should use TLS too if cfg.App.FactomdTlsEnabled == true { *factomdTLSflag = true @@ -202,7 +202,7 @@ func main() { } } - //if all defaults were specified on both the command line and config file + // if all defaults were specified on both the command line and config file if *walletTLSCert == "" { *walletTLSCert = fmt.Sprint( util.GetHomeDir(), @@ -210,7 +210,7 @@ func main() { ) } - //if all defaults were specified on both the command line and config file + // if all defaults were specified on both the command line and config file if *factomdTLSCert == "" { *factomdTLSCert = fmt.Sprint( util.GetHomeDir(), @@ -218,7 +218,7 @@ func main() { ) } - //set the default if a config file doesn't exist + // set the default if a config file doesn't exist if *factomdLocation == "" { *factomdLocation = "localhost:8088" } From ae035cb474292b0891d97a138984f4d064a27790 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 10 Jun 2019 16:04:30 -0500 Subject: [PATCH 03/12] spelling fix --- get.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/get.go b/get.go index 06eebe9..ba4f329 100644 --- a/get.go +++ b/get.go @@ -503,7 +503,7 @@ var getECBlock = func() *fctCmd { pdisp := flag.Bool("P", false, "display only the Previous Header Hash") ldisp := flag.Bool("L", false, "display only the Previous Full Hash") ddisp := flag.Bool("D", false, "display only the Directory Block Height") - adisp := flag.Bool("A", false, "display only the Head Expantion Area") + adisp := flag.Bool("A", false, "display only the Head Expansion Area") hdisp := flag.Bool("H", false, "display only the Header Hash") fdisp := flag.Bool("F", false, "display only the Full Hash") flag.Parse() From d2c69dff6f5ecd75301a3e4457e16f3c1d42fe4d Mon Sep 17 00:00:00 2001 From: Veena Date: Tue, 11 Jun 2019 16:25:18 -0500 Subject: [PATCH 04/12] added glide files --- glide.lock | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ glide.yaml | 15 ++++++++++ 2 files changed, 98 insertions(+) create mode 100644 glide.lock create mode 100644 glide.yaml diff --git a/glide.lock b/glide.lock new file mode 100644 index 0000000..eff20ec --- /dev/null +++ b/glide.lock @@ -0,0 +1,83 @@ +hash: edc6537a1b9388167d119e7eed8fc47f9103fe1bb8e9a7d1ce0dbba05e7dd9ae +updated: 2019-06-10T12:41:29.214065051-05:00 +imports: +- name: github.com/btcsuitereleases/btcutil + version: f2b1058a82554c0c7c3b8809c5956c38374604d8 + subpackages: + - base58 +- name: github.com/FactomProject/basen + version: fe3947df716ebfda9847eb1b9a48f9592e06478c +- name: github.com/FactomProject/btcutil + version: 43986820ccd50b2b02b83e575cb3a39c87457482 + subpackages: + - base58 +- name: github.com/FactomProject/btcutilecc + version: d3a63a5752ecf3fbc06bd97365da752111c263df +- name: github.com/FactomProject/cli + version: 45b367ff72df176679318c157a56e436cd5e00dc +- name: github.com/FactomProject/ed25519 + version: 38002c4fe7b609c2fa3144a3cc29b997b756bb4c + subpackages: + - edwards25519 +- name: github.com/FactomProject/factom + version: 201a384d8e70e8d81b53c730b5432787cf4aeb24 +- name: github.com/FactomProject/factomd + version: c429cbf87dd732ffaf95663fa2b5ab900e33e04d + subpackages: + - activations + - common/constants + - common/globals + - common/interfaces + - common/primitives + - common/primitives/random + - log + - util + - util/atomic +- name: github.com/FactomProject/go-bip32 + version: 3b593af1c415abc1017648e4eb24a88c32fee0f3 +- name: github.com/FactomProject/go-bip39 + version: d1007fb78d9a7ec65314dad412973e63caf4c527 +- name: github.com/FactomProject/go-bip44 + version: b541a96d8da98567af7610ef96105a834e6ed46c +- name: github.com/FactomProject/goleveldb + version: e7800c6976c5d75f0a9c5e9e0e2ff8086940e58f + subpackages: + - leveldb/errors + - leveldb/storage + - leveldb/util +- name: github.com/hashicorp/errwrap + version: 8a6fb523712970c966eefc6b39ed2c5e74880354 +- name: github.com/hashicorp/go-multierror + version: 886a7fbe3eb1c874d46f623bfa70af45f425b3d1 +- name: github.com/konsorten/go-windows-terminal-sequences + version: f55edac94c9bbba5d6182a4be46d86a2c9b5b50e +- name: github.com/michaelbeam/cli + version: e3284e1e16c445cf7b514a5e64e24a0cef25e196 +- name: github.com/posener/complete + version: 3ef9b31a6a0613ae832e7ecf208374027c3b2343 + subpackages: + - cmd + - cmd/install + - match +- name: github.com/sirupsen/logrus + version: fa3c1df5136d05b1b54b72794cf89579f2b39f7b +- name: golang.org/x/crypto + version: 8dd112bcdc25174059e45e07517d9fc663123347 + subpackages: + - pbkdf2 + - ripemd160 + - ssh/terminal +- name: golang.org/x/sys + version: a34e9553db1e492c9a76e60db2296ae7e5fbb772 + subpackages: + - unix + - windows +- name: gopkg.in/gcfg.v1 + version: 61b2c08bc8f6068f7c5ca684372f9a6cb1c45ebe + subpackages: + - scanner + - token + - types +- name: gopkg.in/warnings.v0 + version: ec4a0fea49c7b46c2aeb0b51aac55779c607e52b +testImports: [] diff --git a/glide.yaml b/glide.yaml new file mode 100644 index 0000000..2da95b3 --- /dev/null +++ b/glide.yaml @@ -0,0 +1,15 @@ +package: github.com/FactomProject/factom-cli +import: +- package: github.com/FactomProject/btcutil + subpackages: + - base58 +- package: github.com/FactomProject/cli +- package: github.com/FactomProject/factom + version: ^0.3.5 +- package: github.com/FactomProject/factomd + version: ^6.3.2 + subpackages: + - util +- package: github.com/michaelbeam/cli +- package: github.com/posener/complete + version: ^1.2.1 From 401b8de6a848e041540c58fcd7e1720a6fbade1c Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 12 Jun 2019 10:09:53 -0500 Subject: [PATCH 05/12] spelling --- diagnostics.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/diagnostics.go b/diagnostics.go index 4d61fe4..b856350 100644 --- a/diagnostics.go +++ b/diagnostics.go @@ -153,7 +153,7 @@ var diagnosticsSync = func() *fctCmd { cmd.execFunc = func(args []string) { os.Args = args sdisp := flag.Bool("S", false, "display only the syncing status") - rdisp := flag.Bool("R", false, "display only the recieved status") + rdisp := flag.Bool("R", false, "display only the received status") edisp := flag.Bool("E", false, "display only the expected status") flag.Parse() args = flag.Args() @@ -173,7 +173,7 @@ var diagnosticsSync = func() *fctCmd { fmt.Println(d.SyncInfo.Expected) default: fmt.Println("Status:", d.SyncInfo.Status) - fmt.Println("Recieved:", d.SyncInfo.Received) + fmt.Println("Received:", d.SyncInfo.Received) fmt.Println("Expected:", d.SyncInfo.Expected) for _, m := range d.SyncInfo.Missing { fmt.Println("Missing:", m) From edea2e47ee42d93867924478233fde0f588f8b25 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 12 Jun 2019 10:14:21 -0500 Subject: [PATCH 06/12] fixed import --- diagnostics.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diagnostics.go b/diagnostics.go index b856350..f5c8919 100644 --- a/diagnostics.go +++ b/diagnostics.go @@ -9,8 +9,8 @@ import ( "fmt" "os" + "github.com/FactomProject/cli" "github.com/FactomProject/factom" - "github.com/michaelbeam/cli" "github.com/posener/complete" ) From e1f933aa6964db04a954a2bb6544504e03aa6c69 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 12 Jun 2019 10:14:59 -0500 Subject: [PATCH 07/12] glide --- glide.lock | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/glide.lock b/glide.lock index 97b4927..ff5eac6 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ hash: 6440fbb001c9acaeba825a1e889f03eaa8f0f6f6b579432ec96eaaa1b553c81f -updated: 2019-06-12T10:12:56.545433903-05:00 +updated: 2019-06-12T10:14:34.741707088-05:00 imports: - name: github.com/btcsuitereleases/btcutil version: f2b1058a82554c0c7c3b8809c5956c38374604d8 @@ -55,8 +55,6 @@ imports: version: 886a7fbe3eb1c874d46f623bfa70af45f425b3d1 - name: github.com/konsorten/go-windows-terminal-sequences version: 5c8c8bd35d3832f5d134ae1e1e375b69a4d25242 -- name: github.com/michaelbeam/cli - version: e3284e1e16c445cf7b514a5e64e24a0cef25e196 - name: github.com/posener/complete version: 3ef9b31a6a0613ae832e7ecf208374027c3b2343 subpackages: From 54bba72639a61194f1fe03ad1bce571c6a063d0b Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 12 Jun 2019 16:06:56 -0500 Subject: [PATCH 08/12] spelling --- get.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/get.go b/get.go index ba4f329..add5b06 100644 --- a/get.go +++ b/get.go @@ -231,7 +231,7 @@ var getChainHead = func() *fctCmd { var getABlock = func() *fctCmd { cmd := new(fctCmd) - cmd.helpMsg = "factom-cli get ABlock [-RDBPL] HEIGHT|KEYMR" + cmd.helpMsg = "factom-cli get ablock [-RDBPL] HEIGHT|KEYMR" cmd.description = "Get an Admin Block from factom by its Key Merkel Root " + "or by its Height" cmd.completion = complete.Command{ From e5124eb8f124649c9a18311324ba99fadbb1e157 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 13 Jun 2019 11:24:44 -0500 Subject: [PATCH 09/12] spelling --- get.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/get.go b/get.go index add5b06..a2573bf 100644 --- a/get.go +++ b/get.go @@ -279,7 +279,7 @@ var getABlock = func() *fctCmd { case *ddisp: fmt.Println(ablock.DBHeight) case *bdisp: - fmt.Println(ablock.BackReverenceHash) + fmt.Println(ablock.BackReferenceHash) case *pdisp: fmt.Println(ablock.PrevBackreferenceHash) case *ldisp: From 151166c087895322da20636a163c6a89016d9396 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 13 Jun 2019 15:56:38 -0500 Subject: [PATCH 10/12] glide --- glide.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glide.lock b/glide.lock index ff5eac6..496e2f8 100644 --- a/glide.lock +++ b/glide.lock @@ -20,7 +20,7 @@ imports: subpackages: - edwards25519 - name: github.com/FactomProject/factom - version: 201a384d8e70e8d81b53c730b5432787cf4aeb24 + version: 0483d598b4413d1a2653ae263d4c1b39de7db896 - name: github.com/FactomProject/factomd version: c429cbf87dd732ffaf95663fa2b5ab900e33e04d subpackages: From f743e8bd169ec207ce0dcbb2a873c00d448b1f19 Mon Sep 17 00:00:00 2001 From: Joshua Brigati Date: Fri, 21 Jun 2019 11:28:56 -0500 Subject: [PATCH 11/12] updated glide with updated factom with sequenceNumber --- glide.lock | 2 +- glide.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glide.lock b/glide.lock index 496e2f8..d7a8e51 100644 --- a/glide.lock +++ b/glide.lock @@ -20,7 +20,7 @@ imports: subpackages: - edwards25519 - name: github.com/FactomProject/factom - version: 0483d598b4413d1a2653ae263d4c1b39de7db896 + version: 2403dbaeb4670238c5135ef76732cbc902140683 - name: github.com/FactomProject/factomd version: c429cbf87dd732ffaf95663fa2b5ab900e33e04d subpackages: diff --git a/glide.yaml b/glide.yaml index ee5d40d..68ce534 100644 --- a/glide.yaml +++ b/glide.yaml @@ -5,7 +5,7 @@ import: - base58 - package: github.com/FactomProject/cli - package: github.com/FactomProject/factom - version: v1-rollup-testing + version: FD-1071_adding_Sequence - package: github.com/FactomProject/factomd version: ^6.3.2 subpackages: From 6e7eb084ef141b9735b3a2114b827bad076cd397 Mon Sep 17 00:00:00 2001 From: Joshua Brigati Date: Mon, 24 Jun 2019 16:06:54 -0500 Subject: [PATCH 12/12] updated with most up to date factom commit from v1-rollup --- glide.lock | 2 +- glide.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glide.lock b/glide.lock index d7a8e51..bab46cb 100644 --- a/glide.lock +++ b/glide.lock @@ -20,7 +20,7 @@ imports: subpackages: - edwards25519 - name: github.com/FactomProject/factom - version: 2403dbaeb4670238c5135ef76732cbc902140683 + version: c27795c3b9085472d123b2a2fe4a5e4cd4fb17e4 - name: github.com/FactomProject/factomd version: c429cbf87dd732ffaf95663fa2b5ab900e33e04d subpackages: diff --git a/glide.yaml b/glide.yaml index 68ce534..5ad0884 100644 --- a/glide.yaml +++ b/glide.yaml @@ -5,7 +5,7 @@ import: - base58 - package: github.com/FactomProject/cli - package: github.com/FactomProject/factom - version: FD-1071_adding_Sequence + version: v1-rollup - package: github.com/FactomProject/factomd version: ^6.3.2 subpackages: