Skip to content

Commit

Permalink
Merge pull request #2 from ultraio/feature/BLOCK-2575-sync-with-main
Browse files Browse the repository at this point in the history
BLOCK-2575 - Sync with upstream main branch
  • Loading branch information
Adam-Ultra authored Nov 14, 2024
2 parents 9d862bc + 4ddff8e commit 9fd3a37
Show file tree
Hide file tree
Showing 26 changed files with 1,096 additions and 306 deletions.
31 changes: 17 additions & 14 deletions .github/workflows/contract.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,44 +43,47 @@ jobs:
with:
owner: AntelopeIO
repo: cdt
target: 'v3.1.0'
target: 'v4.0.1'
prereleases: false
file: 'cdt_.*amd64.deb'

- name: Install CDT
run: sudo apt-get install -y ./cdt*.deb
run: |
sudo apt-get update && sudo apt-get upgrade -y
sudo apt-get install -y ./cdt*.deb
- name: Build EOS EVM Contract
run: .github/workflows/build-contract.sh
env:
DWITH_TEST_ACTIONS: ${{ matrix.DWITH_TEST_ACTIONS }}

- name: Upload Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: contract.test-actions-${{ matrix.DWITH_TEST_ACTIONS }}.tar.gz
path: contract.tar.gz
if-no-files-found: error

- name: Download Leap - dev binary
- name: Download antelope-spring-dev
uses: AntelopeIO/asset-artifact-download-action@v3
with:
owner: AntelopeIO
repo: leap
target: '^5.0.1'
repo: spring
file: 'antelope-spring-dev.*ubuntu22\.04_amd64.deb'
target: 'main'
prereleases: false
file: 'leap-dev.*ubuntu22\.04_amd64.deb'
container-package: experimental-binaries
artifact-name: leap-dev-ubuntu22-amd64
artifact-name: antelope-spring-dev-ubuntu22-amd64
container-package: antelope-spring-experimental-binaries

- name: Install Leap
run: sudo apt-get install -y ./leap*.deb
- name: Install packages
run: sudo apt-get install -y ./*.deb

- name: Build EOS EVM Contract Tests
run: .github/workflows/build-contract-test.sh

- name: Upload Artifacts
uses: actions/upload-artifact@v3
if: ${{ matrix.DWITH_TEST_ACTIONS == 'on' }}
uses: actions/upload-artifact@v4
with:
name: contract-test.tar.gz
path: contract-test.tar.gz
Expand All @@ -92,8 +95,8 @@ jobs:
DWITH_TEST_ACTIONS: ${{ matrix.DWITH_TEST_ACTIONS }}

- name: Upload Test Metrics
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: test-results.xml
name: test-results-test-actions-${{ matrix.DWITH_TEST_ACTIONS }}.xml
path: test-results.xml
if-no-files-found: error
118 changes: 97 additions & 21 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1,97 @@
Copyright (c) 2022-2023 EOS Network Foundation (ENF) and its contributors. All rights reserved.

The MIT License

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
License text copyright (c) 2023 MariaDB plc, All Rights Reserved. "Business
Source License" is a trademark of MariaDB plc.

Parameters

Licensor: EOS NETWORK FOUNDATION ("ENF")

Licensed Work: EOS-EVM Contract v.1 Copyright ENF, 2024, All Rights
Reserved

Additional Use Grant: Licensee (You) is granted, free of charge, to deal in
the Licensed Work without restriction, including
without limitation the rights to use, copy, modify,
merge, publish, distribute, sublicense, and/or sell
copies of the Licensed Work, and to permit persons to
whom the Licensed Work is furnished to do so, subject
to the following conditions:

Your use of the Licensed Work is Directly in Service
of or Materially Dependent on the EOS Blockchain
Network

The copyright notice and this permission notice shall
be included in all copies or substantial portions of
the Software.

For the purposes of this license:

"EOS Blockchain Network" is defined as any blockchain
network created with the EOSIO, or Antelope,
protocols, or any future protocols derived
substantially from them whose genesis block id as
defined by the Licensed Work is 00000001405147477ab2f5...
f51cda427b638191c66d2c59aa392d5c2c98076cb0

"Directly in Service" is defined as any use which is
necessary for the EOS Blockchain to persist and
continue operations including but not limited to
hosting network nodes, archives, RPC endpoints, and
integration with 3rd party services.

"Materially Dependent" is defined as use that would
cease to operate effectively or economically if the
EOS blockchain component was removed temporarily or
permanently.

Change Date: Four years from the date the Licensed Work is published

Change License: MIT 2.0

For information about alternative licensing arrangements for the Licensed Work,
please contact [email protected].

Notice

Business Source License 1.1

Terms

The Licensor hereby grants you the right to copy, modify, create derivative
works, redistribute, and make non-production use of the Licensed Work. The
Licensor may make an Additional Use Grant, above, permitting limited production
use.

Effective on the Change Date, or the fourth anniversary of the first publicly
available distribution of a specific version of the Licensed Work under this
License, whichever comes first, the Licensor hereby grants you rights under
the terms of the Change License, and the rights granted in the paragraph
above terminate.

If your use of the Licensed Work does not comply with the requirements
currently in effect as described in this License, you must purchase a
commercial license from the Licensor, its affiliated entities, or authorized
resellers, or you must refrain from using the Licensed Work.

All copies of the original and modified Licensed Work, and derivative works
of the Licensed Work, are subject to this License. This License applies
separately for each version of the Licensed Work and the Change Date may vary
for each version of the Licensed Work released by Licensor.

You must conspicuously display this License on each original or modified copy
of the Licensed Work. If you receive the Licensed Work in original or
modified form from a third party, the terms and conditions set forth in this
License apply to your use of that work.

Any use of the Licensed Work in violation of this License will automatically
terminate your rights under this License for the current and all other
versions of the Licensed Work.

This License does not grant you any right in any trademark or logo of
Licensor or its affiliates (provided that you may use a trademark or logo of
Licensor as expressly required by this License).

TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND TITLE.
Loading

0 comments on commit 9fd3a37

Please sign in to comment.