Adds missing fields in getTransactionReceipt rpc response.

Tenderly · Jun 5, 2019 · c483571 · c483571
1 parent 568003c
commit c483571
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 10 deletions.
diff --git a/commands/push.go b/commands/push.go
@@ -3,6 +3,13 @@ package commands
 import (
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"time"
+
 	"github.com/briandowns/spinner"
 	"github.com/logrusorgru/aurora"
 	"github.com/sirupsen/logrus"
@@ -12,12 +19,6 @@ import (
 	"github.com/tenderly/tenderly-cli/rest/payloads"
 	"github.com/tenderly/tenderly-cli/truffle"
 	"github.com/tenderly/tenderly-cli/userError"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"time"
 )
 
 func init() {
@@ -65,9 +66,9 @@ func uploadContracts(rest *rest.Rest) error {
 	}
 
 	logrus.Info("Analyzing Truffle configuration...")
-	truffleConfig, err := getTruffleConfig("truffle.js", projectDir)
+	truffleConfig, err := getTruffleConfig("truffle-config.js", projectDir)
 	if err != nil {
-		truffleConfig, err = getTruffleConfig("truffle-config.js", projectDir)
+		truffleConfig, err = getTruffleConfig("truffle.js", projectDir)
 	}
 
 	if err != nil {
@@ -113,6 +114,10 @@ func uploadContracts(rest *rest.Rest) error {
 
 	response, err := rest.Contract.UploadContracts(payloads.UploadContractsRequest{
 		Contracts: contracts,
+		Config: payloads.Config{
+			OptimizationsUsed:  truffleConfig.Compilers["solc"].Optimizer.Enabled,
+			OptimizationsCount: truffleConfig.Compilers["solc"].Optimizer.Runs,
+		},
 	})
 
 	s.Stop()

diff --git a/rest/call/contract.go b/rest/call/contract.go
@@ -16,7 +16,7 @@ func NewContractCalls() *ContractCalls {
 }
 
 func (rest *ContractCalls) UploadContracts(request payloads.UploadContractsRequest) (*payloads.UploadContractsResponse, error) {
-	contractsJson, err := json.Marshal(request)
+	uploadJson, err := json.Marshal(request)
 	if err != nil {
 		return nil, err
 	}
@@ -26,7 +26,7 @@ func (rest *ContractCalls) UploadContracts(request payloads.UploadContractsReque
 	response := client.Request(
 		"POST",
 		"api/v1/account/"+config.GetString(config.AccountID)+"/project/"+config.GetString(config.ProjectSlug)+"/contracts",
-		contractsJson,
+		uploadJson,
 	)
 
 	err = json.NewDecoder(response).Decode(&contracts)

diff --git a/rest/payloads/contractPayloads.go b/rest/payloads/contractPayloads.go
@@ -4,9 +4,15 @@ import "github.com/tenderly/tenderly-cli/truffle"
 
 type UploadContractsRequest struct {
 	Contracts []truffle.Contract `json:"contracts"`
+	Config    Config             `json:"config"`
 }
 
 type UploadContractsResponse struct {
 	Contracts []truffle.ApiContract `json:"contracts"`
 	Error     *ApiError             `json:"error"`
 }
+
+type Config struct {
+	OptimizationsUsed  bool `json:"optimizations_used"`
+	OptimizationsCount int  `json:"optimizations_count"`
+}
diff --git a/truffle/config.go b/truffle/config.go
@@ -8,10 +8,20 @@ type NetworkConfig struct {
 	NetworkID interface{} `json:"network_id"`
 }
 
+type Compiler struct {
+	Version   string    `json:"version"`
+	Optimizer Optimizer `json:"optimizer"`
+}
+
+type Optimizer struct {
+	Enabled bool `json:"enabled"`
+	Runs    int  `json:"runs"`
+}
 type Config struct {
 	ProjectDirectory string                   `json:"project_directory"`
 	BuildDirectory   string                   `json:"contracts_build_directory"`
 	Networks         map[string]NetworkConfig `json:"networks"`
+	Compilers        map[string]Compiler      `json:"compilers"`
 }
 
 func (c *Config) AbsoluteBuildDirectoryPath() string {