Merge pull request #100 from koinos/3-fixes

sgerbino · web-flow · commit 55fbd6312b56 · 2022-03-09T14:35:49.000-05:00
v3 fixes
diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/ethereum/go-ethereum v1.10.9
 	github.com/joho/godotenv v1.3.0
 	github.com/koinos/koinos-proto-golang v0.2.1-0.20220224180227-6fbc5fe4a89a
-	github.com/koinos/koinos-util-golang v0.0.0-20220301215016-a6dd44e1b886
+	github.com/koinos/koinos-util-golang v0.0.0-20220309184603-4faf8205b8ed
 	github.com/minio/sio v0.3.0
 	github.com/mr-tron/base58 v1.2.0
 	github.com/multiformats/go-multihash v0.1.0
diff --git a/go.sum b/go.sum
@@ -280,6 +280,8 @@ github.com/koinos/koinos-util-golang v0.0.0-20220301213529-8bf7f9fb7703 h1:3RYpw
 github.com/koinos/koinos-util-golang v0.0.0-20220301213529-8bf7f9fb7703/go.mod h1:0+oSa/Ml9+INjfAGubMtKNOq+e4a/OoEz7GfaQPN/P8=
 github.com/koinos/koinos-util-golang v0.0.0-20220301215016-a6dd44e1b886 h1:aCqcoOZnpL0+xJ/T2c2hZIDH5JHKRR87ZczRqI0WDfs=
 github.com/koinos/koinos-util-golang v0.0.0-20220301215016-a6dd44e1b886/go.mod h1:0+oSa/Ml9+INjfAGubMtKNOq+e4a/OoEz7GfaQPN/P8=
+github.com/koinos/koinos-util-golang v0.0.0-20220309184603-4faf8205b8ed h1:Zga+bkh2cIoD/J/qZZLoOt/F/UHRBz9o5i1PlaTuWGw=
+github.com/koinos/koinos-util-golang v0.0.0-20220309184603-4faf8205b8ed/go.mod h1:0+oSa/Ml9+INjfAGubMtKNOq+e4a/OoEz7GfaQPN/P8=
 github.com/koinos/protobuf-go v1.27.2-0.20211016005428-adb3d63afc5e h1:e92AS0/Aklop09SUlZXIaKJKMAtFsp1bMCf8SKRdVVE=
 github.com/koinos/protobuf-go v1.27.2-0.20211016005428-adb3d63afc5e/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 github.com/koinos/protobuf-go v1.27.2-0.20211026185306-2456c83214fe h1:PJ+2AnN4ibN2WxldiClplZZosQNPnXj7S5vOeFNtV+M=
diff --git a/internal/cli/commands.go b/internal/cli/commands.go
@@ -178,7 +178,7 @@ func (c *BalanceCommand) Execute(ctx context.Context, ee *ExecutionEnvironment)
 	balance, err := ee.RPCClient.GetAccountBalance(address, contractID, cliutil.KoinBalanceOfEntry)
 
 	// Build the result
-	dec, err := util.SatoshiToDecimal(int64(balance), cliutil.KoinPrecision)
+	dec, err := util.SatoshiToDecimal(balance, cliutil.KoinPrecision)
 	if err != nil {
 		return nil, err
 	}
@@ -190,7 +190,7 @@ func (c *BalanceCommand) Execute(ctx context.Context, ee *ExecutionEnvironment)
 	}
 
 	// Build the mana result
-	manaDec, err := util.SatoshiToDecimal(int64(mana), cliutil.KoinPrecision)
+	manaDec, err := util.SatoshiToDecimal(mana, cliutil.KoinPrecision)
 	if err != nil {
 		return nil, err
 	}
@@ -771,7 +771,7 @@ func (c *RcLimitCommand) Execute(ctx context.Context, ee *ExecutionEnvironment)
 			return nil, err
 		}
 
-		dAmount, err := util.SatoshiToDecimal(int64(limit), cliutil.KoinPrecision)
+		dAmount, err := util.SatoshiToDecimal(limit, cliutil.KoinPrecision)
 		if err != nil {
 			return nil, err
 		}
@@ -943,14 +943,15 @@ func (c *TransferCommand) Execute(ctx context.Context, ee *ExecutionEnvironment)
 	if err != nil {
 		return nil, err
 	}
-	dBalance, err := util.SatoshiToDecimal(int64(balance), cliutil.KoinPrecision)
+	dBalance, err := util.SatoshiToDecimal(balance, cliutil.KoinPrecision)
 	if err != nil {
 		return nil, err
 	}
 
 	// Ensure a transfer greater than opened account balance
-	if int64(balance) <= sAmount {
-		return nil, fmt.Errorf("%w: insufficient balance %s %s on opened wallet %s, cannot transfer %s %s", cliutil.ErrInvalidAmount, dBalance, cliutil.KoinSymbol, myAddress, dAmount, cliutil.KoinSymbol)
+
+	if balance <= sAmount {
+		return nil, fmt.Errorf("%w: insufficient balance %s %s on opened wallet %s, cannot transfer %s %s", cliutil.ErrInvalidAmount, dBalance, cliutil.KoinSymbol, base58.Encode(myAddress), dAmount, cliutil.KoinSymbol)
 	}
 
 	toAddress := base58.Decode(c.Address)
diff --git a/internal/cli/interpreter.go b/internal/cli/interpreter.go
@@ -134,7 +134,7 @@ func (ee *ExecutionEnvironment) GetRcLimit() (uint64, error) {
 			return 0, fmt.Errorf("%w: %s", cliutil.ErrInvalidAmount, err.Error())
 		}
 
-		return uint64(val), nil
+		return val, nil
 	}
 
 	// else it's relative
diff --git a/internal/cliutil/util.go b/internal/cliutil/util.go
@@ -14,7 +14,7 @@ import (
 
 const (
 	// Version number (this should probably not live here)
-	Version = "v0.2.0"
+	Version = "v0.3.1"
 )
 
 // Hardcoded Koin contract constants
@@ -45,7 +45,7 @@ func TransactionReceiptToString(receipt *protocol.TransactionReceipt, operations
 	}
 
 	// Build the mana result
-	manaDec, err := util.SatoshiToDecimal(int64(receipt.RcUsed), KoinPrecision)
+	manaDec, err := util.SatoshiToDecimal(receipt.RcUsed, KoinPrecision)
 	if err != nil {
 		s += "\n" + err.Error()
 		return s

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ func (c BalanceCommand) Execute(ctx context.Context, ee ExecutionEnvironment)`
`178`	`178`	`balance, err := ee.RPCClient.GetAccountBalance(address, contractID, cliutil.KoinBalanceOfEntry)`
`179`	`179`
`180`	`180`	`// Build the result`
`181`		`- dec, err := util.SatoshiToDecimal(int64(balance), cliutil.KoinPrecision)`
	`181`	`+ dec, err := util.SatoshiToDecimal(balance, cliutil.KoinPrecision)`
`182`	`182`	`if err != nil {`
`183`	`183`	`return nil, err`
`184`	`184`	`}`
`@@ -190,7 +190,7 @@ func (c BalanceCommand) Execute(ctx context.Context, ee ExecutionEnvironment)`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`// Build the mana result`
`193`		`- manaDec, err := util.SatoshiToDecimal(int64(mana), cliutil.KoinPrecision)`
	`193`	`+ manaDec, err := util.SatoshiToDecimal(mana, cliutil.KoinPrecision)`
`194`	`194`	`if err != nil {`
`195`	`195`	`return nil, err`
`196`	`196`	`}`
`@@ -771,7 +771,7 @@ func (c RcLimitCommand) Execute(ctx context.Context, ee ExecutionEnvironment)`
`771`	`771`	`return nil, err`
`772`	`772`	`}`
`773`	`773`
`774`		`- dAmount, err := util.SatoshiToDecimal(int64(limit), cliutil.KoinPrecision)`
	`774`	`+ dAmount, err := util.SatoshiToDecimal(limit, cliutil.KoinPrecision)`
`775`	`775`	`if err != nil {`
`776`	`776`	`return nil, err`
`777`	`777`	`}`
`@@ -943,14 +943,15 @@ func (c TransferCommand) Execute(ctx context.Context, ee ExecutionEnvironment)`
`943`	`943`	`if err != nil {`
`944`	`944`	`return nil, err`
`945`	`945`	`}`
`946`		`- dBalance, err := util.SatoshiToDecimal(int64(balance), cliutil.KoinPrecision)`
	`946`	`+ dBalance, err := util.SatoshiToDecimal(balance, cliutil.KoinPrecision)`
`947`	`947`	`if err != nil {`
`948`	`948`	`return nil, err`
`949`	`949`	`}`
`950`	`950`
`951`	`951`	`// Ensure a transfer greater than opened account balance`
`952`		`- if int64(balance) <= sAmount {`
`953`		`- return nil, fmt.Errorf("%w: insufficient balance %s %s on opened wallet %s, cannot transfer %s %s", cliutil.ErrInvalidAmount, dBalance, cliutil.KoinSymbol, myAddress, dAmount, cliutil.KoinSymbol)`
	`952`	`+`
	`953`	`+ if balance <= sAmount {`
	`954`	`+ return nil, fmt.Errorf("%w: insufficient balance %s %s on opened wallet %s, cannot transfer %s %s", cliutil.ErrInvalidAmount, dBalance, cliutil.KoinSymbol, base58.Encode(myAddress), dAmount, cliutil.KoinSymbol)`
`954`	`955`	`}`
`955`	`956`
`956`	`957`	`toAddress := base58.Decode(c.Address)`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ func (ee *ExecutionEnvironment) GetRcLimit() (uint64, error) {`
`134`	`134`	`return 0, fmt.Errorf("%w: %s", cliutil.ErrInvalidAmount, err.Error())`
`135`	`135`	`}`
`136`	`136`
`137`		`- return uint64(val), nil`
	`137`	`+ return val, nil`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`// else it's relative`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`
`15`	`15`	`const (`
`16`	`16`	`// Version number (this should probably not live here)`
`17`		`- Version = "v0.2.0"`
	`17`	`+ Version = "v0.3.1"`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`// Hardcoded Koin contract constants`
`@@ -45,7 +45,7 @@ func TransactionReceiptToString(receipt *protocol.TransactionReceipt, operations`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`// Build the mana result`
`48`		`- manaDec, err := util.SatoshiToDecimal(int64(receipt.RcUsed), KoinPrecision)`
	`48`	`+ manaDec, err := util.SatoshiToDecimal(receipt.RcUsed, KoinPrecision)`
`49`	`49`	`if err != nil {`
`50`	`50`	`s += "\n" + err.Error()`
`51`	`51`	`return s`