Merge branch 'develop' into prune-state-manager

.github/workflows/build-test.yml

@@ -18,13 +18,6 @@ jobs:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v3
 
-      - name: Install solc
-        run: |
-          sudo apt update 
-          sudo add-apt-repository ppa:ethereum/ethereum
-          sudo apt-get update
-          sudo apt-get install solc
-
       - name: Get dependencies
         run: |
           make wasm
@@ -51,13 +44,6 @@ jobs:
         with:
           go-version: "1.20"
 
-      - name: Install solc
-        run: |
-          sudo apt update 
-          sudo add-apt-repository ppa:ethereum/ethereum
-          sudo apt-get update
-          sudo apt-get install solc
-
       - name: install rust-toolchain
         uses: actions-rs/[email protected]
         with:
@@ -87,7 +73,6 @@ jobs:
         env:
           TEST_LANG: ${{matrix.TEST_LANG}}
         run: |
-          make compile-solidity
           cd contracts/wasm
           if [ $TEST_LANG == "go" ]; then
             go test ./...
@@ -107,15 +92,6 @@ jobs:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v3
 
-      - name: Install solc
-        run: |
-          sudo apt update 
-          sudo add-apt-repository ppa:ethereum/ethereum
-          sudo apt-get update
-          sudo apt-get install solc
-      - name: Compile solidity contracts
-        run: make compile-solidity
-
       # - name: Generate SC files
       #   run: |
       #     cd contracts/wasm/scripts
@@ -132,13 +108,13 @@ jobs:
         uses: golangci/golangci-lint-action@v3
         with:
           version: v1.53.2
-          args: --timeout 10m0s
+          args: --timeout 15m0s
           skip-pkg-cache: true
 
       - name: Run  golangci-lint on wasp-cli
         uses: golangci/golangci-lint-action@v3
         with:
           working-directory: tools/wasp-cli
           version: v1.53.2
-          args: --timeout 10m0s
+          args: --timeout 15m0s
           skip-pkg-cache: true 

.github/workflows/heavy-tests.yml

@@ -16,12 +16,6 @@ jobs:
         run: |
           apt update
           apt install -y build-essential libstdc++6 software-properties-common make gcc git curl tar
-      - name: Install solc
-        id: solc
-        run: |
-          add-apt-repository ppa:ethereum/ethereum
-          apt-get update
-          apt-get install solc
       - name: Check out code into the Go module directory
         id: checkout
         uses: actions/checkout@v3
@@ -31,10 +25,6 @@ jobs:
         with:
           go-version: "1.20"
 
-      - name: Compile solidity contracts
-        id: make_solidity
-        run: make compile-solidity
-
       - name: Run global scope golangci-lint
         id: global_lint
         uses: golangci/golangci-lint-action@v3
@@ -127,12 +117,6 @@ jobs:
         run: |
           apt update
           apt install -y build-essential libstdc++6 software-properties-common make gcc git wget curl tar
-      - name: Install solc
-        id: solc
-        run: |
-          add-apt-repository ppa:ethereum/ethereum
-          apt-get update
-          apt-get install solc
       - name: checkout to the directory
         id: checkout
         uses: actions/checkout@v3
@@ -191,7 +175,6 @@ jobs:
         env:
           TEST_LANG: ${{matrix.TEST_LANG}}
         run: |
-          make compile-solidity
           cd contracts/wasm
           if [ $TEST_LANG == "go" ]; then
             go test ./...
@@ -271,12 +254,6 @@ jobs:
         run: |
           apt update
           apt install -y build-essential libstdc++6 software-properties-common make gcc git curl tar
-      - name: Install solc
-        id: solc
-        run: |
-          add-apt-repository ppa:ethereum/ethereum
-          apt-get update
-          apt-get install solc
       - name: Check out code into the Go module directory
         id: checkout
         uses: actions/checkout@v3
@@ -438,4 +415,4 @@ jobs:
               "repository": "${{ github.repository }}"
             }
         env:
-          SLACK_WEBHOOK_URL: "${{ secrets.SLACK_WEBHOOK_URL }}"
+          SLACK_WEBHOOK_URL: "${{ secrets.SLACK_WEBHOOK_URL }}"

.github/workflows/release.yml

@@ -12,15 +12,6 @@ jobs:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v3
 
-      - name: Install solc
-        run: |
-          sudo add-apt-repository ppa:ethereum/ethereum
-          sudo apt update
-          sudo apt install -y solc
-
-      - name: Compile solidity contracts
-        run: make compile-solidity
-
       - name: Tar temporary artifacts
         run: tar --exclude='temp.tar' -cf temp.tar ./
 

.gitignore

@@ -37,10 +37,6 @@ wal/
 ./snapshot
 ./gascalibration
 tests_output.log
-packages/evm/**/*.bin
-packages/evm/**/*.bin-runtime
-packages/vm/core/evm/**/*.bin
-packages/vm/core/evm/**/*.bin-runtime
 *__debug_bin
 *.blk
 go.work

.golangci.yml

@@ -140,7 +140,6 @@ linters:
     disable-all: true
     enable:
         - bodyclose # Checks whether HTTP response body is closed successfully.
-        - dogsled # Checks assignments with too many blank identifiers (e.g. x, , , _, := f()).
         - dupl # Tool for code clone detection.
         - errcheck # Errcheck is a program for checking for unchecked errors in go programs. These unchecked errors can be critical bugs in some cases
         - exportloopref # Checks for pointers to enclosing loop variables.

Makefile

@@ -24,22 +24,16 @@ wasm:
 	bash contracts/wasm/scripts/schema_all.sh
 
 compile-solidity:
-ifdef SKIP_SOLIDITY
-	@echo "skipping compile-solidity rule"
-else ifeq (, $(shell which solc))
-	@echo "no solc found in PATH, evm contracts won't be compiled"
-else
 	cd packages/vm/core/evm/iscmagic && go generate
 	cd packages/evm/evmtest && go generate
-endif
 
 build-cli:
 	cd tools/wasp-cli && go mod tidy && go build -ldflags $(BUILD_LD_FLAGS) -o ../../
 
-build-full: compile-solidity build-cli
+build-full: build-cli
 	$(BUILD_CMD) ./...
 
-build: compile-solidity build-cli
+build: build-cli
 	$(BUILD_CMD) $(BUILD_PKGS)
 
 build-lint: build lint
@@ -59,10 +53,10 @@ test-short:
 install-cli:
 	cd tools/wasp-cli && go mod tidy && go install -ldflags $(BUILD_LD_FLAGS)
 
-install-full: compile-solidity install-cli
+install-full: install-cli
 	$(INSTALL_CMD) ./...
 
-install: compile-solidity install-cli install-pkgs
+install: install-cli install-pkgs
 
 install-pkgs:
 	$(INSTALL_CMD) $(BUILD_PKGS)
@@ -82,7 +76,7 @@ apiclient-docker:
 gofumpt-list:
 	gofumpt -l ./
 
-docker-build: compile-solidity
+docker-build:
 	DOCKER_BUILDKIT=1 docker build ${DOCKER_BUILD_ARGS} \
 		--build-arg BUILD_TAGS=${BUILD_TAGS} \
 		--build-arg BUILD_LD_FLAGS=${BUILD_LD_FLAGS} \

clients/apiclient/.openapi-generator/FILES

@@ -47,7 +47,7 @@ docs/DefaultApi.md
 docs/ErrorMessageFormatResponse.md
 docs/EstimateGasRequestOffledger.md
 docs/EstimateGasRequestOnledger.md
-docs/Event.md
+docs/EventJSON.md
 docs/EventsResponse.md
 docs/FeePolicy.md
 docs/FoundryOutputResponse.md
@@ -75,7 +75,6 @@ docs/NativeToken.md
 docs/NativeTokenIDRegistryResponse.md
 docs/NodeApi.md
 docs/NodeMessageMetrics.md
-docs/NodeOwnerCertificateRequest.md
 docs/NodeOwnerCertificateResponse.md
 docs/OffLedgerRequest.md
 docs/OnLedgerRequest.md
@@ -145,7 +144,7 @@ model_dk_shares_post_request.go
 model_error_message_format_response.go
 model_estimate_gas_request_offledger.go
 model_estimate_gas_request_onledger.go
-model_event.go
+model_event_json.go
 model_events_response.go
 model_fee_policy.go
 model_foundry_output_response.go
@@ -171,7 +170,6 @@ model_native_token.go
 model_native_token_id_registry_response.go
 model_nft_data_response.go
 model_node_message_metrics.go
-model_node_owner_certificate_request.go
 model_node_owner_certificate_response.go
 model_off_ledger_request.go
 model_on_ledger_request.go