Skip to content

Commit

Permalink
Merge pull request #17 from 0xPolygon/feature/update_contracts
Browse files Browse the repository at this point in the history
- Update banana contracts
- Add elderberry contracts Paris compilation
  • Loading branch information
joanestebanr authored Jul 29, 2024
2 parents 301fa4c + 6f768c4 commit e02ffda
Show file tree
Hide file tree
Showing 209 changed files with 144,629 additions and 19 deletions.
5 changes: 4 additions & 1 deletion contracts/banana/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# banana contracts

All the files and directories within this directory have been generated using the import-contracts command of the CLI in this repo.
The ABI and the binnaries of the smart contracts have been extracted from [zkevm-contracts repo](https://github.com/0xPolygonHermez/zkevm-contracts), using the version feature/banana (commit 027f5fd69315ffd0960dc8fe570f42e0533ff169)
The ABI and the binnaries of the smart contracts have been extracted from [zkevm-contracts repo](https://github.com/0xPolygonHermez/zkevm-contracts), using the version feature/banana (commit 533641301223a1e413b2e8f0323354671f310922)

Commandline used: ` $ go run ./cmd import-contracts --contracts-version feature/banana --contracts-alias banana --node-version 18 `

4 changes: 2 additions & 2 deletions contracts/banana/abi/PolygonZkEVMGlobalExitRootV2.abi
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
{
"indexed": false,
"internalType": "uint32",
"name": "depositCount",
"name": "leafIndex",
"type": "uint32"
},
{
Expand Down Expand Up @@ -222,7 +222,7 @@
"inputs": [
{
"internalType": "uint32",
"name": "depositCount",
"name": "leafIndex",
"type": "uint32"
}
],
Expand Down
2 changes: 1 addition & 1 deletion contracts/banana/bin/PolygonZkEVMGlobalExitRootV2.bin
Original file line number Diff line number Diff line change
@@ -1 +1 @@
60c060405234801561000f575f80fd5b50604051610e50380380610e5083398101604081905261002e9161012b565b6001600160a01b0380831660a0528116608052610049610050565b505061015c565b602e54610100900460ff16156100bc5760405162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b606482015260840160405180910390fd5b602e5460ff908116101561010e57602e805460ff191660ff9081179091556040519081527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b565b80516001600160a01b0381168114610126575f80fd5b919050565b5f806040838503121561013c575f80fd5b61014583610110565b915061015360208401610110565b90509250929050565b60805160a051610cc561018b5f395f818161015701526102f701525f818161022e01526102ab0152610cc55ff3fe608060405234801561000f575f80fd5b50600436106100e5575f3560e01c80635ca1e1651161008857806383f244031161006357806383f2440314610216578063a3c573eb14610229578063ef4eeb3514610250578063fb5708341461026f575f80fd5b80635ca1e1651461019e5780635d810501146101a65780638129fc1c1461020e575f80fd5b8063319cf735116100c3578063319cf7351461012c57806333d6247d146101355780633ed691ef1461014a57806349b7b80214610152575f80fd5b806301fd9044146100e9578063257b3632146101045780632dfdf0b514610123575b5f80fd5b6100f15f5481565b6040519081526020015b60405180910390f35b6100f1610112366004610972565b60026020525f908152604090205481565b6100f160235481565b6100f160015481565b610148610143366004610972565b610292565b005b6100f161046b565b6101797f000000000000000000000000000000000000000000000000000000000000000081565b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020016100fb565b6100f161047e565b6100f16101b4366004610989565b604080516020808201959095528082019390935260c09190911b7fffffffffffffffff0000000000000000000000000000000000000000000000001660608301528051604881840301815260689092019052805191012090565b610148610487565b6100f16102243660046109f4565b61067b565b6101797f000000000000000000000000000000000000000000000000000000000000000081565b6100f161025e366004610a30565b602f6020525f908152604090205481565b61028261027d366004610a50565b610750565b60405190151581526020016100fb565b5f8073ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001633036102e057505060018190555f548161035f565b73ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000016330361032d5750505f819055600154819061035f565b6040517fb49365dd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b5f61036a8284610767565b5f8181526002602052604081205491925003610465575f61038c600143610ac2565b5f8381526002602090815260409182902092409283905581518082018690528083018490527fffffffffffffffff0000000000000000000000000000000000000000000000004260c01b16606082015282518082036048018152606890910190925281519101209091506103ff90610796565b5f61040861047e565b60235463ffffffff165f908152602f60205260409081902082905551909150859085907ffe83b6f5b84bf01e2e7e3c0efaf3626b47dd84ade929d7b8002b237fe8d5427f9061045a9085815260200190565b60405180910390a350505b50505050565b5f6104796001545f54610767565b905090565b5f610479610896565b602e54610100900460ff16158080156104a75750602e54600160ff909116105b806104c15750303b1580156104c15750602e5460ff166001145b610551576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201527f647920696e697469616c697a6564000000000000000000000000000000000000606482015260840160405180910390fd5b602e80547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016600117905580156105af57602e80547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff166101001790555b5f6105b861047e565b6023805463ffffffff9081165f908152602f602090815260409182902085905592548151921682529181018390529192507f11f50c71891002839c2637ce302087160298255a87f1ea60d40e8db081383fad910160405180910390a150801561067857602e80547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b50565b5f83815b602081101561074757600163ffffffff8516821c811690036106ea578481602081106106ad576106ad610ad5565b6020020135826040516020016106cd929190918252602082015260400190565b604051602081830303815290604052805190602001209150610735565b818582602081106106fd576106fd610ad5565b602002013560405160200161071c929190918252602082015260400190565b6040516020818303038152906040528051906020012091505b8061073f81610b02565b91505061067f565b50949350505050565b5f8161075d86868661067b565b1495945050505050565b604080516020808201859052818301849052825180830384018152606090920190925280519101205b92915050565b8060016107a560206002610c57565b6107af9190610ac2565b602354106107e9576040517fef5ccf6600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b5f60235f81546107f890610b02565b918290555090505f5b6020811015610888578082901c60011660010361083457826003826020811061082c5761082c610ad5565b015550505050565b6003816020811061084757610847610ad5565b01546040805160208101929092528101849052606001604051602081830303815290604052805190602001209250808061088090610b02565b915050610801565b50610891610c62565b505050565b6023545f90819081805b6020811015610969578083901c6001166001036108fd57600381602081106108ca576108ca610ad5565b0154604080516020810192909252810185905260600160405160208183030381529060405280519060200120935061092a565b60408051602081018690529081018390526060016040516020818303038152906040528051906020012093505b6040805160208101849052908101839052606001604051602081830303815290604052805190602001209150808061096190610b02565b9150506108a0565b50919392505050565b5f60208284031215610982575f80fd5b5035919050565b5f805f6060848603121561099b575f80fd5b8335925060208401359150604084013567ffffffffffffffff811681146109c0575f80fd5b809150509250925092565b806104008101831015610790575f80fd5b803563ffffffff811681146109ef575f80fd5b919050565b5f805f6104408486031215610a07575f80fd5b83359250610a1885602086016109cb565b9150610a2761042085016109dc565b90509250925092565b5f60208284031215610a40575f80fd5b610a49826109dc565b9392505050565b5f805f806104608587031215610a64575f80fd5b84359350610a7586602087016109cb565b9250610a8461042086016109dc565b939692955092936104400135925050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52601160045260245ffd5b8181038181111561079057610790610a95565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52603260045260245ffd5b5f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203610b3257610b32610a95565b5060010190565b600181815b80851115610b9257817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff04821115610b7857610b78610a95565b80851615610b8557918102915b93841c9390800290610b3e565b509250929050565b5f82610ba857506001610790565b81610bb457505f610790565b8160018114610bca5760028114610bd457610bf0565b6001915050610790565b60ff841115610be557610be5610a95565b50506001821b610790565b5060208310610133831016604e8410600b8410161715610c13575081810a610790565b610c1d8383610b39565b807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff04821115610c4f57610c4f610a95565b029392505050565b5f610a498383610b9a565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52600160045260245ffdfea26469706673582212209937073008e426f4df13693706d6a8d0dffcbaf1d70750d4b4849ad2a7a1446f64736f6c63430008140033
60c060405234801561000f575f80fd5b50604051610e50380380610e5083398101604081905261002e9161012b565b6001600160a01b0380831660a0528116608052610049610050565b505061015c565b602e54610100900460ff16156100bc5760405162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b606482015260840160405180910390fd5b602e5460ff908116101561010e57602e805460ff191660ff9081179091556040519081527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b565b80516001600160a01b0381168114610126575f80fd5b919050565b5f806040838503121561013c575f80fd5b61014583610110565b915061015360208401610110565b90509250929050565b60805160a051610cc561018b5f395f818161015701526102f701525f818161022e01526102ab0152610cc55ff3fe608060405234801561000f575f80fd5b50600436106100e5575f3560e01c80635ca1e1651161008857806383f244031161006357806383f2440314610216578063a3c573eb14610229578063ef4eeb3514610250578063fb5708341461026f575f80fd5b80635ca1e1651461019e5780635d810501146101a65780638129fc1c1461020e575f80fd5b8063319cf735116100c3578063319cf7351461012c57806333d6247d146101355780633ed691ef1461014a57806349b7b80214610152575f80fd5b806301fd9044146100e9578063257b3632146101045780632dfdf0b514610123575b5f80fd5b6100f15f5481565b6040519081526020015b60405180910390f35b6100f1610112366004610972565b60026020525f908152604090205481565b6100f160235481565b6100f160015481565b610148610143366004610972565b610292565b005b6100f161046b565b6101797f000000000000000000000000000000000000000000000000000000000000000081565b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020016100fb565b6100f161047e565b6100f16101b4366004610989565b604080516020808201959095528082019390935260c09190911b7fffffffffffffffff0000000000000000000000000000000000000000000000001660608301528051604881840301815260689092019052805191012090565b610148610487565b6100f16102243660046109f4565b61067b565b6101797f000000000000000000000000000000000000000000000000000000000000000081565b6100f161025e366004610a30565b602f6020525f908152604090205481565b61028261027d366004610a50565b610750565b60405190151581526020016100fb565b5f8073ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001633036102e057505060018190555f548161035f565b73ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000016330361032d5750505f819055600154819061035f565b6040517fb49365dd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b5f61036a8284610767565b5f8181526002602052604081205491925003610465575f61038c600143610ac2565b5f8381526002602090815260409182902092409283905581518082018690528083018490527fffffffffffffffff0000000000000000000000000000000000000000000000004260c01b16606082015282518082036048018152606890910190925281519101209091506103ff90610796565b5f61040861047e565b60235463ffffffff165f908152602f60205260409081902082905551909150859085907ffe83b6f5b84bf01e2e7e3c0efaf3626b47dd84ade929d7b8002b237fe8d5427f9061045a9085815260200190565b60405180910390a350505b50505050565b5f6104796001545f54610767565b905090565b5f610479610896565b602e54610100900460ff16158080156104a75750602e54600160ff909116105b806104c15750303b1580156104c15750602e5460ff166001145b610551576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201527f647920696e697469616c697a6564000000000000000000000000000000000000606482015260840160405180910390fd5b602e80547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016600117905580156105af57602e80547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff166101001790555b5f6105b861047e565b6023805463ffffffff9081165f908152602f602090815260409182902085905592548151921682529181018390529192507f11f50c71891002839c2637ce302087160298255a87f1ea60d40e8db081383fad910160405180910390a150801561067857602e80547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b50565b5f83815b602081101561074757600163ffffffff8516821c811690036106ea578481602081106106ad576106ad610ad5565b6020020135826040516020016106cd929190918252602082015260400190565b604051602081830303815290604052805190602001209150610735565b818582602081106106fd576106fd610ad5565b602002013560405160200161071c929190918252602082015260400190565b6040516020818303038152906040528051906020012091505b8061073f81610b02565b91505061067f565b50949350505050565b5f8161075d86868661067b565b1495945050505050565b604080516020808201859052818301849052825180830384018152606090920190925280519101205b92915050565b8060016107a560206002610c57565b6107af9190610ac2565b602354106107e9576040517fef5ccf6600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b5f60235f81546107f890610b02565b918290555090505f5b6020811015610888578082901c60011660010361083457826003826020811061082c5761082c610ad5565b015550505050565b6003816020811061084757610847610ad5565b01546040805160208101929092528101849052606001604051602081830303815290604052805190602001209250808061088090610b02565b915050610801565b50610891610c62565b505050565b6023545f90819081805b6020811015610969578083901c6001166001036108fd57600381602081106108ca576108ca610ad5565b0154604080516020810192909252810185905260600160405160208183030381529060405280519060200120935061092a565b60408051602081018690529081018390526060016040516020818303038152906040528051906020012093505b6040805160208101849052908101839052606001604051602081830303815290604052805190602001209150808061096190610b02565b9150506108a0565b50919392505050565b5f60208284031215610982575f80fd5b5035919050565b5f805f6060848603121561099b575f80fd5b8335925060208401359150604084013567ffffffffffffffff811681146109c0575f80fd5b809150509250925092565b806104008101831015610790575f80fd5b803563ffffffff811681146109ef575f80fd5b919050565b5f805f6104408486031215610a07575f80fd5b83359250610a1885602086016109cb565b9150610a2761042085016109dc565b90509250925092565b5f60208284031215610a40575f80fd5b610a49826109dc565b9392505050565b5f805f806104608587031215610a64575f80fd5b84359350610a7586602087016109cb565b9250610a8461042086016109dc565b939692955092936104400135925050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52601160045260245ffd5b8181038181111561079057610790610a95565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52603260045260245ffd5b5f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203610b3257610b32610a95565b5060010190565b600181815b80851115610b9257817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff04821115610b7857610b78610a95565b80851615610b8557918102915b93841c9390800290610b3e565b509250929050565b5f82610ba857506001610790565b81610bb457505f610790565b8160018114610bca5760028114610bd457610bf0565b6001915050610790565b60ff841115610be557610be5610a95565b50506001821b610790565b5060208310610133831016604e8410600b8410161715610c13575081810a610790565b610c1d8383610b39565b807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff04821115610c4f57610c4f610a95565b029392505050565b5f610a498383610b9a565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52600160045260245ffdfea26469706673582212202c998cc5136dc28c529f98c1a9a8fd26cdab5ad02f46dd603de4eb720f1d6c1e64736f6c63430008140033
Loading

0 comments on commit e02ffda

Please sign in to comment.