Skip to content

N
nebula
Commit 34ed8ff4 authored by clabby's avatar clabby Committed by GitHub
Browse files
Options

Use same `PreimageOracle` for alphabet VM and cannon VM (#9314)

parent 450c1446
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
op-bindings/bindings/alphabetvm.go
View file @ 34ed8ff4
...@@ -30,8 +30,8 @@ var ( ...@@ -30,8 +30,8 @@ var (
// AlphabetVMMetaData contains all meta data concerning the AlphabetVM contract. // AlphabetVMMetaData contains all meta data concerning the AlphabetVM contract.
var AlphabetVMMetaData = &bind.MetaData{ var AlphabetVMMetaData = &bind.MetaData{
ABI: "[{\"type\":\"constructor\",\"inputs\":[{\"name\":\"_absolutePrestate\",\"type\":\"bytes32\",\"internalType\":\"Claim\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"oracle\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIPreimageOracle\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"step\",\"inputs\":[{\"name\":\"_stateData\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"_localContext\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[{\"name\":\"postState_\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"}]", ABI: "[{\"type\":\"constructor\",\"inputs\":[{\"name\":\"_absolutePrestate\",\"type\":\"bytes32\",\"internalType\":\"Claim\"},{\"name\":\"_oracle\",\"type\":\"address\",\"internalType\":\"contractPreimageOracle\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"oracle\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIPreimageOracle\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"step\",\"inputs\":[{\"name\":\"_stateData\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"_localContext\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[{\"name\":\"postState_\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"}]",
Bin: "0x60a060405234801561001057600080fd5b50604051613bd8380380613bd883398101604081905261002f916100ab565b806080818152505060008060006040516100489061009e565b92835260208301919091526040820152606001604051809103906000f080158015610077573d6000803e3d6000fd5b50600080546001600160a01b0319166001600160a01b0392909216919091179055506100c4565b6135f6806105e283390190565b6000602082840312156100bd57600080fd5b5051919050565b6080516105046100de600039600060af01526105046000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80637dc0d1d01461003b578063e14ced3214610085575b600080fd5b60005461005b9073ffffffffffffffffffffffffffffffffffffffff1681565b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020015b60405180910390f35b610098610093366004610395565b6100a6565b60405190815260200161007c565b600080600060087f0000000000000000000000000000000000000000000000000000000000000000901b600889896040516100e2929190610409565b6040518091039020901b036101d9576000805473ffffffffffffffffffffffffffffffffffffffff1663e03110e161011b60048861029f565b6040517fffffffff0000000000000000000000000000000000000000000000000000000060e084901b1681526004810191909152600060248201526044016040805180830381865afa158015610175573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101999190610419565b50640ffffffff0607c82901c169350905063ffffffff608082901c1660006101c38a8c018c61043d565b90506101cf8582610485565b9350505050610206565b6101e58789018961049d565b9092509050816101f4816104bf565b9250508080610202906104bf565b9150505b6040805160208101849052908101829052606001604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815291905280516020909101207effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f01000000000000000000000000000000000000000000000000000000000000001798975050505050505050565b7f01000000000000000000000000000000000000000000000000000000000000007effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff831617610345818360408051600093845233602052918152606090922091527effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f01000000000000000000000000000000000000000000000000000000000000001790565b9392505050565b60008083601f84011261035e57600080fd5b50813567ffffffffffffffff81111561037657600080fd5b60208301915083602082850101111561038e57600080fd5b9250929050565b6000806000806000606086880312156103ad57600080fd5b853567ffffffffffffffff808211156103c557600080fd5b6103d189838a0161034c565b909750955060208801359150808211156103ea57600080fd5b506103f78882890161034c565b96999598509660400135949350505050565b8183823760009101908152919050565b6000806040838503121561042c57600080fd5b505080516020909101519092909150565b60006020828403121561044f57600080fd5b5035919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b6000821982111561049857610498610456565b500190565b600080604083850312156104b057600080fd5b50508035926020909101359150565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82036104f0576104f0610456565b506001019056fea164736f6c634300080f000a60e06040523480156200001157600080fd5b50604051620035f6380380620035f68339810160408190526200003491620000f9565b60c083905260a0829052608081905260005b62000054600160106200013e565b811015620000ef576003816010811062000072576200007262000158565b0154600382601081106200008a576200008a62000158565b0154604080516020810193909352820152606001604051602081830303815290604052805190602001206003826001620000c591906200016e565b60108110620000d857620000d862000158565b015580620000e68162000189565b91505062000046565b50505050620001a5565b6000806000606084860312156200010f57600080fd5b8351925060208401519150604084015190509250925092565b634e487b7160e01b600052601160045260246000fd5b60008282101562000153576200015362000128565b500390565b634e487b7160e01b600052603260045260246000fd5b6000821982111562000184576200018462000128565b500190565b6000600182016200019e576200019e62000128565b5060010190565b60805160a05160c051613413620001e3600039600081816103f901526119c701526000818161046d015261123101526000610f7b01526134136000f3fe608060405234801561001057600080fd5b50600436106101ae5760003560e01c80639d53a648116100ee578063dd24f9bf11610097578063ec5efcbc11610071578063ec5efcbc14610458578063f3f480d91461046b578063faf37bc714610491578063fef2b4ed146104a457600080fd5b8063dd24f9bf146103f7578063e03110e11461041d578063e15926111461044557600080fd5b8063b4801e61116100c8578063b4801e61146103c9578063d18534b5146103dc578063da35c664146103ef57600080fd5b80639d53a648146103495780639d7e87691461038b578063b2e67ba81461039e57600080fd5b806361238bde1161015b5780637ac54767116101355780637ac54767146102b95780638542cf50146102cc578063882856ef1461030a5780638dc4be111461033657600080fd5b806361238bde146102505780636551927b1461027b5780637917de1d146102a657600080fd5b80633909af5c1161018c5780633909af5c146102205780634d52b4c91461023557806352f0f3ad1461023d57600080fd5b8063013cf08b146101b35780630359a563146101f75780632055b36b14610218575b600080fd5b6101c66101c13660046129ca565b6104c4565b6040805173ffffffffffffffffffffffffffffffffffffffff90931683526020830191909152015b60405180910390f35b61020a610205366004612a0c565b610509565b6040519081526020016101ee565b61020a601081565b61023361022e366004612c07565b610641565b005b61020a61088f565b61020a61024b366004612cf3565b6108aa565b61020a61025e366004612d2e565b600160209081526000928352604080842090915290825290205481565b61020a610289366004612a0c565b601560209081526000928352604080842090915290825290205481565b6102336102b4366004612d92565b61097f565b61020a6102c73660046129ca565b610e0d565b6102fa6102da366004612d2e565b600260209081526000928352604080842090915290825290205460ff1681565b60405190151581526020016101ee565b61031d610318366004612e2e565b610e24565b60405167ffffffffffffffff90911681526020016101ee565b610233610344366004612e61565b610e7e565b61020a610357366004612a0c565b73ffffffffffffffffffffffffffffffffffffffff9091166000908152601760209081526040808320938352929052205490565b610233610399366004612ead565b610f79565b61020a6103ac366004612a0c565b601660209081526000928352604080842090915290825290205481565b61020a6103d7366004612e2e565b61118a565b6102336103ea366004612c07565b6111bc565b60135461020a565b7f000000000000000000000000000000000000000000000000000000000000000061020a565b61043061042b366004612d2e565b6115ca565b604080519283526020830191909152016101ee565b610233610453366004612e61565b6116bb565b610233610466366004612f39565b6117c3565b7f000000000000000000000000000000000000000000000000000000000000000061020a565b61023361049f366004612fd2565b61193d565b61020a6104b23660046129ca565b60006020819052908152604090205481565b601381815481106104d457600080fd5b60009182526020909120600290910201805460019091015473ffffffffffffffffffffffffffffffffffffffff909116915082565b73ffffffffffffffffffffffffffffffffffffffff82166000908152601560209081526040808320848452909152812054819061054c9060601c63ffffffff1690565b63ffffffff16905060005b601081101561063957816001166001036105df5773ffffffffffffffffffffffffffffffffffffffff85166000908152601460209081526040808320878452909152902081601081106105ac576105ac61300e565b01546040805160208101929092528101849052606001604051602081830303815290604052805190602001209250610620565b82600382601081106105f3576105f361300e565b01546040805160208101939093528201526060016040516020818303038152906040528051906020012092505b60019190911c90806106318161306c565b915050610557565b505092915050565b600061064d8a8a610509565b905061067086868360208b013561066b6106668d6130a4565b611b50565b611b90565b801561068e575061068e838383602088013561066b6106668a6130a4565b6106c4576040517f09bde33900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8660400135886040516020016106da9190613173565b6040516020818303038152906040528051906020012014610727576040517f1968a90200000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b83602001358760200135600161073d91906131b1565b14610774576040517f9a3b119900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6107bc8861078286806131c9565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250611bf192505050565b6107c588611d4c565b8360400135886040516020016107db9190613173565b6040516020818303038152906040528051906020012003610828576040517f9843145b00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b5050505073ffffffffffffffffffffffffffffffffffffffff9590951660009081526015602090815260408083209683529590529390932080547fffffffffffffffffffffffffffffffffffffffffffffffff000000000000000016600117905550505050565b600161089d60106002613350565b6108a7919061335c565b81565b60006108b686866125e8565b90506108c38360086131b1565b8211806108d05750602083115b15610907576040517ffe25498700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000602081815260c085901b82526008959095528251828252600286526040808320858452875280832080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660019081179091558484528752808320948352938652838220558181529384905292205592915050565b60608115610998576109918686612695565b90506109d2565b85858080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509293505050505b3360009081526014602090815260408083208b845290915280822081516102008101928390529160109082845b8154815260200190600101908083116109ff57505050505090506000601560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008b81526020019081526020016000205490506000610a808260601c63ffffffff1690565b63ffffffff169050333214610ac1576040517fba092d1600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b610ad18260801c63ffffffff1690565b63ffffffff16600003610b10576040517f87138d5c00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b610b1a8260c01c90565b67ffffffffffffffff1615610b5b576040517f475a253500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b898114610b94576040517f60f95d5a00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b610ba189898d888661270e565b83516020850160888204881415608883061715610bc6576307b1daf16000526004601cfd5b60405160c8810160405260005b83811015610c76578083018051835260208101516020840152604081015160408401526060810151606084015260808101516080840152508460888301526088810460051b8b013560a883015260c882206001860195508560005b610200811015610c6b576001821615610c4b5782818b0152610c6b565b8981015160009081526020938452604090209260019290921c9101610c2e565b505050608801610bd3565b50505050600160106002610c8a9190613350565b610c94919061335c565b811115610ccd576040517f6229572300000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b610d42610ce08360401c63ffffffff1690565b610cf09063ffffffff168a6131b1565b60401b7fffffffffffffffffffffffffffffffffffffffff00000000ffffffffffffffff606084901b167fffffffffffffffffffffffffffffffff0000000000000000ffffffffffffffff8516171790565b91508415610d6d5777ffffffffffffffffffffffffffffffffffffffffffffffff82164260c01b1791505b3360009081526014602090815260408083208e84529091529020610d9390846010612940565b50503360008181526017602090815260408083208e8452825280832080546001810182559084528284206004820401805460039092166008026101000a67ffffffffffffffff818102199093164390931602919091179055928252601581528282209c82529b909b52909920989098555050505050505050565b60038160108110610e1d57600080fd5b0154905081565b60176020528260005260406000206020528160005260406000208181548110610e4c57600080fd5b906000526020600020906004918282040191900660080292509250509054906101000a900467ffffffffffffffff1681565b604435600080600883018610610e9c5763fe2549876000526004601cfd5b60c083901b60805260888386823786600882030151915060206000858360025afa905080610ec957600080fd5b50600080517effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f0400000000000000000000000000000000000000000000000000000000000000178082526002602090815260408084208a8552825280842080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660019081179091558385528252808420998452988152888320939093558152908190529490942055505050565b7f0000000000000000000000000000000000000000000000000000000000000000421015610fd3576040517f299f254900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600080603087600037602060006030600060025afa80610ffb5763f91129696000526004601cfd5b6000517effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f010000000000000000000000000000000000000000000000000000000000000017608081815260a08c905260c08b905260308a60e037603088609083013760008060c083600a5afa92508261107d576309bde3396000526004601cfd5b602886106110935763fe2549876000526004601cfd5b6000602882015278200000000000000000000000000000000000000000000000008152600881018b905285810151935060308a8237603081019b909b52505060509098207effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f0500000000000000000000000000000000000000000000000000000000000000176000818152600260209081526040808320868452825280832080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016600190811790915584845282528083209583529481528482209a909a559081528089529190912096909655505050505050565b601460205282600052604060002060205281600052604060002081601081106111b257600080fd5b0154925083915050565b73ffffffffffffffffffffffffffffffffffffffff891660009081526015602090815260408083208b845290915290205467ffffffffffffffff81161561122f576040517fc334f06900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b7f000000000000000000000000000000000000000000000000000000000000000061125a8260c01c90565b61126e9067ffffffffffffffff164261335c565b116112a5576040517f55d4cbf900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60006112b18b8b610509565b90506112ca87878360208c013561066b6106668e6130a4565b80156112e857506112e8848483602089013561066b6106668b6130a4565b61131e576040517f09bde33900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8760400135896040516020016113349190613173565b6040516020818303038152906040528051906020012014611381576040517f1968a90200000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b84602001358860200135600161139791906131b1565b1415806113c9575060016113b18360601c63ffffffff1690565b6113bb9190613373565b63ffffffff16856020013514155b15611400576040517f9a3b119900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60006114128360801c63ffffffff1690565b63ffffffff1690508061142b8460401c63ffffffff1690565b63ffffffff1614611468576040517f7b1dafd100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6114768a61078288806131c9565b61147f8a611d4c565b600061148a8b612861565b7effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f020000000000000000000000000000000000000000000000000000000000000017905060006114e18560a01c63ffffffff1690565b67ffffffffffffffff169050600160026000848152602001908152602001600020600083815260200190815260200160002060006101000a81548160ff021916908315150217905550601660008f73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008e8152602001908152602001600020546001600084815260200190815260200160002060008381526020019081526020016000208190555082600080848152602001908152602001600020819055505050505050505050505050505050565b6000828152600260209081526040808320848452909152812054819060ff16611653576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601460248201527f7072652d696d616765206d757374206578697374000000000000000000000000604482015260640160405180910390fd5b506000838152602081815260409091205461166f8160086131b1565b61167a8560206131b1565b10611698578361168b8260086131b1565b611695919061335c565b91505b506000938452600160209081526040808620948652939052919092205492909150565b6044356000806008830186106116d95763fe2549876000526004601cfd5b60c083901b6080526088838682378087017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80151908490207effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f02000000000000000000000000000000000000000000000000000000000000001760008181526002602090815260408083208b8452825280832080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016600190811790915584845282528083209a83529981528982209390935590815290819052959095209190915550505050565b60006117cf8686610509565b90506117e8838383602088013561066b6106668a6130a4565b61181e576040517f09bde33900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60208401351561185a576040517f9a3b119900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b61186261297e565b6118708161078287806131c9565b61187981611d4c565b84604001358160405160200161188f9190613173565b60405160208183030381529060405280519060200120036118dc576040517f9843145b00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b5050505073ffffffffffffffffffffffffffffffffffffffff9290921660009081526015602090815260408083209383529290522080547fffffffffffffffffffffffffffffffffffffffffffffffff000000000000000016600117905550565b333214611976576040517fba092d1600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b611981816008613398565b63ffffffff168263ffffffff16106119c5576040517ffe25498700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000008163ffffffff161015611a25576040517f7b1dafd100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b336000818152601560209081526040808320878452825280832080547fffffffffffffffff0000000000000000ffffffffffffffffffffffffffffffff1660a09790971b7fffffffffffffffffffffffff00000000ffffffffffffffffffffffffffffffff169690961760809590951b9490941790945582518084019093529082529181019283526013805460018101825592525160029091027f66de8ffda797e3de9c05e8fc57b3bf0ec28a930d40b0d285d93c06501cf6a0908101805473ffffffffffffffffffffffffffffffffffffffff9093167fffffffffffffffffffffffff00000000000000000000000000000000000000009093169290921790915590517f66de8ffda797e3de9c05e8fc57b3bf0ec28a930d40b0d285d93c06501cf6a09190910155565b6000816000015182602001518360400151604051602001611b73939291906133c0565b604051602081830303815290604052805190602001209050919050565b60008160005b6010811015611be4578060051b880135600186831c1660018114611bc95760008481526020839052604090209350611bda565b600082815260208590526040902093505b5050600101611b96565b5090931495945050505050565b6088815114611bff57600080fd5b6020810160208301611c80565b8260031b8201518060001a8160011a60081b178160021a60101b8260031a60181b17178160041a60201b8260051a60281b178260061a60301b8360071a60381b1717179050611c7a81611c65868560059190911b015190565b1867ffffffffffffffff16600586901b840152565b50505050565b611c8c60008383611c0c565b611c9860018383611c0c565b611ca460028383611c0c565b611cb060038383611c0c565b611cbc60048383611c0c565b611cc860058383611c0c565b611cd460068383611c0c565b611ce060078383611c0c565b611cec60088383611c0c565b611cf860098383611c0c565b611d04600a8383611c0c565b611d10600b8383611c0c565b611d1c600c8383611c0c565b611d28600d8383611c0c565b611d34600e8383611c0c565b611d40600f8383611c0c565b611c7a60108383611c0c565b6040805178010000000000008082800000000000808a8000000080008000602082015279808b00000000800000018000000080008081800000000000800991810191909152788a00000000000000880000000080008009000000008000000a60608201527b8000808b800000000000008b8000000000008089800000000000800360808201527f80000000000080028000000000000080000000000000800a800000008000000a60a08201527f800000008000808180000000000080800000000080000001800000008000800860c082015260009060e001604051602081830303815290604052905060208201602082016124c8565b6102808101516101e082015161014083015160a0840151845118189118186102a082015161020083015161016084015160c0850151602086015118189118186102c083015161022084015161018085015160e0860151604087015118189118186102e08401516102408501516101a0860151610100870151606088015118189118186103008501516102608601516101c0870151610120880151608089015118189118188084603f1c611eff8660011b67ffffffffffffffff1690565b18188584603f1c611f1a8660011b67ffffffffffffffff1690565b18188584603f1c611f358660011b67ffffffffffffffff1690565b181895508483603f1c611f528560011b67ffffffffffffffff1690565b181894508387603f1c611f6f8960011b67ffffffffffffffff1690565b60208b01518b51861867ffffffffffffffff168c5291189190911897508118600181901b603f9190911c18935060c08801518118601481901c602c9190911b1867ffffffffffffffff1660208901526101208801518718602c81901c60149190911b1867ffffffffffffffff1660c08901526102c08801518618600381901c603d9190911b1867ffffffffffffffff166101208901526101c08801518718601981901c60279190911b1867ffffffffffffffff166102c08901526102808801518218602e81901c60129190911b1867ffffffffffffffff166101c089015260408801518618600281901c603e9190911b1867ffffffffffffffff166102808901526101808801518618601581901c602b9190911b1867ffffffffffffffff1660408901526101a08801518518602781901c60199190911b1867ffffffffffffffff166101808901526102608801518718603881901c60089190911b1867ffffffffffffffff166101a08901526102e08801518518600881901c60389190911b1867ffffffffffffffff166102608901526101e08801518218601781901c60299190911b1867ffffffffffffffff166102e089015260808801518718602581901c601b9190911b1867ffffffffffffffff166101e08901526103008801518718603281901c600e9190911b1867ffffffffffffffff1660808901526102a08801518118603e81901c60029190911b1867ffffffffffffffff166103008901526101008801518518600981901c60379190911b1867ffffffffffffffff166102a08901526102008801518118601381901c602d9190911b1867ffffffffffffffff1661010089015260a08801518218601c81901c60249190911b1867ffffffffffffffff1661020089015260608801518518602481901c601c9190911b1867ffffffffffffffff1660a08901526102408801518518602b81901c60159190911b1867ffffffffffffffff1660608901526102208801518618603181901c600f9190911b1867ffffffffffffffff166102408901526101608801518118603681901c600a9190911b1867ffffffffffffffff166102208901525060e08701518518603a81901c60069190911b1867ffffffffffffffff166101608801526101408701518118603d81901c60039190911b1867ffffffffffffffff1660e0880152505067ffffffffffffffff81166101408601525050505050565b6122ef81611e42565b805160208201805160408401805160608601805160808801805167ffffffffffffffff871986168a188116808c528619851689188216909952831982169095188516909552841988169091188316909152941990921618811690925260a08301805160c0808601805160e0880180516101008a0180516101208c018051861985168a188d16909a528319821686188c16909652801989169092188a169092528619861618881690529219909216909218841690526101408401805161016086018051610180880180516101a08a0180516101c08c0180518619851689188d169099528319821686188c16909652801988169092188a169092528519851618881690529119909116909118841690526101e08401805161020086018051610220880180516102408a0180516102608c0180518619851689188d169099528319821686188c16909652801988169092188a16909252851985161888169052911990911690911884169052610280840180516102a0860180516102c0880180516102e08a0180516103008c0180518619851689188d169099528319821686188c16909652801988169092188a16909252851985161888169052911990911690911884169052600386901b850151901c9081189091168252611c7a565b6124d4600082846122e6565b6124e0600182846122e6565b6124ec600282846122e6565b6124f8600382846122e6565b612504600482846122e6565b612510600582846122e6565b61251c600682846122e6565b612528600782846122e6565b612534600882846122e6565b612540600982846122e6565b61254c600a82846122e6565b612558600b82846122e6565b612564600c82846122e6565b612570600d82846122e6565b61257c600e82846122e6565b612588600f82846122e6565b612594601082846122e6565b6125a0601182846122e6565b6125ac601282846122e6565b6125b8601382846122e6565b6125c4601482846122e6565b6125d0601582846122e6565b6125dc601682846122e6565b611c7a601782846122e6565b7f01000000000000000000000000000000000000000000000000000000000000007effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff83161761268e818360408051600093845233602052918152606090922091527effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f01000000000000000000000000000000000000000000000000000000000000001790565b9392505050565b60606040519050816020820181810182868337608883068080156126de5760888290038501848101848103803687375060806001820353506001845160001a17845386526126f5565b608836843760018353608060878401536088850186525b5050505050601f19603f82510116810160405292915050565b60006127208260a01c63ffffffff1690565b67ffffffffffffffff169050600061273e8360801c63ffffffff1690565b63ffffffff16905060006127588460401c63ffffffff1690565b63ffffffff16905060088310801561276e575080155b156127a25760c082901b6000908152883560085283513382526016602090815260408084208a855290915290912055612857565b600883101580156127c05750806127ba60088561335c565b93508310155b80156127d457506127d187826131b1565b83105b156128575760006127e5828561335c565b9050876127f38260206131b1565b101580156127ff575085155b15612836576040517ffe25498700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b3360009081526016602090815260408083208a845290915290209089013590555b5050505050505050565b60006128e4565b66ff00ff00ff00ff8160081c1667ff00ff00ff00ff006128928360081b67ffffffffffffffff1690565b1617905065ffff0000ffff8160101c1667ffff0000ffff00006128bf8360101b67ffffffffffffffff1690565b1617905060008160201c6128dd8360201b67ffffffffffffffff1690565b1792915050565b608082015160208301906128fc90612868565b612868565b604082015161290a90612868565b60401b176129226128f760018460059190911b015190565b825160809190911b9061293490612868565b60c01b17179392505050565b826010810192821561296e579160200282015b8281111561296e578251825591602001919060010190612953565b5061297a929150612996565b5090565b60405180602001604052806129916129ab565b905290565b5b8082111561297a5760008155600101612997565b6040518061032001604052806019906020820280368337509192915050565b6000602082840312156129dc57600080fd5b5035919050565b803573ffffffffffffffffffffffffffffffffffffffff81168114612a0757600080fd5b919050565b60008060408385031215612a1f57600080fd5b612a28836129e3565b946020939093013593505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b604051610320810167ffffffffffffffff81118282101715612a8957612a89612a36565b60405290565b6040516060810167ffffffffffffffff81118282101715612a8957612a89612a36565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff81118282101715612af957612af9612a36565b604052919050565b6000610320808385031215612b1557600080fd5b604051602080820167ffffffffffffffff8382108183111715612b3a57612b3a612a36565b8160405283955087601f880112612b5057600080fd5b612b58612a65565b9487019491508188861115612b6c57600080fd5b875b86811015612b945780358381168114612b875760008081fd5b8452928401928401612b6e565b50909352509295945050505050565b600060608284031215612bb557600080fd5b50919050565b60008083601f840112612bcd57600080fd5b50813567ffffffffffffffff811115612be557600080fd5b6020830191508360208260051b8501011115612c0057600080fd5b9250929050565b60008060008060008060008060006103e08a8c031215612c2657600080fd5b612c2f8a6129e3565b985060208a01359750612c458b60408c01612b01565b96506103608a013567ffffffffffffffff80821115612c6357600080fd5b612c6f8d838e01612ba3565b97506103808c0135915080821115612c8657600080fd5b612c928d838e01612bbb565b90975095506103a08c0135915080821115612cac57600080fd5b612cb88d838e01612ba3565b94506103c08c0135915080821115612ccf57600080fd5b50612cdc8c828d01612bbb565b915080935050809150509295985092959850929598565b600080600080600060a08688031215612d0b57600080fd5b505083359560208501359550604085013594606081013594506080013592509050565b60008060408385031215612d4157600080fd5b50508035926020909101359150565b60008083601f840112612d6257600080fd5b50813567ffffffffffffffff811115612d7a57600080fd5b602083019150836020828501011115612c0057600080fd5b600080600080600080600060a0888a031215612dad57600080fd5b8735965060208801359550604088013567ffffffffffffffff80821115612dd357600080fd5b612ddf8b838c01612d50565b909750955060608a0135915080821115612df857600080fd5b50612e058a828b01612bbb565b90945092505060808801358015158114612e1e57600080fd5b8091505092959891949750929550565b600080600060608486031215612e4357600080fd5b612e4c846129e3565b95602085013595506040909401359392505050565b600080600060408486031215612e7657600080fd5b83359250602084013567ffffffffffffffff811115612e9457600080fd5b612ea086828701612d50565b9497909650939450505050565b600080600080600080600060a0888a031215612ec857600080fd5b8735965060208801359550604088013567ffffffffffffffff80821115612eee57600080fd5b612efa8b838c01612d50565b909750955060608a0135915080821115612f1357600080fd5b50612f208a828b01612d50565b989b979a50959894979596608090950135949350505050565b600080600080600060808688031215612f5157600080fd5b612f5a866129e3565b945060208601359350604086013567ffffffffffffffff80821115612f7e57600080fd5b612f8a89838a01612ba3565b94506060880135915080821115612fa057600080fd5b50612fad88828901612bbb565b969995985093965092949392505050565b803563ffffffff81168114612a0757600080fd5b600080600060608486031215612fe757600080fd5b83359250612ff760208501612fbe565b915061300560408501612fbe565b90509250925092565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff820361309d5761309d61303d565b5060010190565b6000606082360312156130b657600080fd5b6130be612a8f565b823567ffffffffffffffff808211156130d657600080fd5b9084019036601f8301126130e957600080fd5b81356020828211156130fd576130fd612a36565b61312d817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f85011601612ab2565b9250818352368183860101111561314357600080fd5b81818501828501376000918301810191909152908352848101359083015250604092830135928101929092525090565b81516103208201908260005b60198110156131a857825167ffffffffffffffff1682526020928301929091019060010161317f565b50505092915050565b600082198211156131c4576131c461303d565b500190565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe18436030181126131fe57600080fd5b83018035915067ffffffffffffffff82111561321957600080fd5b602001915036819003821315612c0057600080fd5b600181815b8085111561328757817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0482111561326d5761326d61303d565b8085161561327a57918102915b93841c9390800290613233565b509250929050565b60008261329e5750600161334a565b816132ab5750600061334a565b81600181146132c157600281146132cb576132e7565b600191505061334a565b60ff8411156132dc576132dc61303d565b50506001821b61334a565b5060208310610133831016604e8410600b841016171561330a575081810a61334a565b613314838361322e565b807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff048211156133465761334661303d565b0290505b92915050565b600061268e838361328f565b60008282101561336e5761336e61303d565b500390565b600063ffffffff838116908316818110156133905761339061303d565b039392505050565b600063ffffffff8083168185168083038211156133b7576133b761303d565b01949350505050565b6000845160005b818110156133e157602081880181015185830152016133c7565b818111156133f0576000828501525b509190910192835250602082015260400191905056fea164736f6c634300080f000a", Bin: "0x60a060405234801561001057600080fd5b506040516105b43803806105b483398101604081905261002f91610059565b608091909152600080546001600160a01b0319166001600160a01b03909216919091179055610096565b6000806040838503121561006c57600080fd5b825160208401519092506001600160a01b038116811461008b57600080fd5b809150509250929050565b6080516105046100b0600039600060af01526105046000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80637dc0d1d01461003b578063e14ced3214610085575b600080fd5b60005461005b9073ffffffffffffffffffffffffffffffffffffffff1681565b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020015b60405180910390f35b610098610093366004610395565b6100a6565b60405190815260200161007c565b600080600060087f0000000000000000000000000000000000000000000000000000000000000000901b600889896040516100e2929190610409565b6040518091039020901b036101d9576000805473ffffffffffffffffffffffffffffffffffffffff1663e03110e161011b60048861029f565b6040517fffffffff0000000000000000000000000000000000000000000000000000000060e084901b1681526004810191909152600060248201526044016040805180830381865afa158015610175573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101999190610419565b50640ffffffff0607c82901c169350905063ffffffff608082901c1660006101c38a8c018c61043d565b90506101cf8582610485565b9350505050610206565b6101e58789018961049d565b9092509050816101f4816104bf565b9250508080610202906104bf565b9150505b6040805160208101849052908101829052606001604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815291905280516020909101207effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f01000000000000000000000000000000000000000000000000000000000000001798975050505050505050565b7f01000000000000000000000000000000000000000000000000000000000000007effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff831617610345818360408051600093845233602052918152606090922091527effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f01000000000000000000000000000000000000000000000000000000000000001790565b9392505050565b60008083601f84011261035e57600080fd5b50813567ffffffffffffffff81111561037657600080fd5b60208301915083602082850101111561038e57600080fd5b9250929050565b6000806000806000606086880312156103ad57600080fd5b853567ffffffffffffffff808211156103c557600080fd5b6103d189838a0161034c565b909750955060208801359150808211156103ea57600080fd5b506103f78882890161034c565b96999598509660400135949350505050565b8183823760009101908152919050565b6000806040838503121561042c57600080fd5b505080516020909101519092909150565b60006020828403121561044f57600080fd5b5035919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b6000821982111561049857610498610456565b500190565b600080604083850312156104b057600080fd5b50508035926020909101359150565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82036104f0576104f0610456565b506001019056fea164736f6c634300080f000a",
} }
// AlphabetVMABI is the input ABI used to generate the binding from. // AlphabetVMABI is the input ABI used to generate the binding from.
...@@ -43,7 +43,7 @@ var AlphabetVMABI = AlphabetVMMetaData.ABI ...@@ -43,7 +43,7 @@ var AlphabetVMABI = AlphabetVMMetaData.ABI
var AlphabetVMBin = AlphabetVMMetaData.Bin var AlphabetVMBin = AlphabetVMMetaData.Bin
// DeployAlphabetVM deploys a new Ethereum contract, binding an instance of AlphabetVM to it. // DeployAlphabetVM deploys a new Ethereum contract, binding an instance of AlphabetVM to it.
func DeployAlphabetVM(auth *bind.TransactOpts, backend bind.ContractBackend, _absolutePrestate [32]byte) (common.Address, *types.Transaction, *AlphabetVM, error) { func DeployAlphabetVM(auth *bind.TransactOpts, backend bind.ContractBackend, _absolutePrestate [32]byte, _oracle common.Address) (common.Address, *types.Transaction, *AlphabetVM, error) {
parsed, err := AlphabetVMMetaData.GetAbi() parsed, err := AlphabetVMMetaData.GetAbi()
if err != nil { if err != nil {
return common.Address{}, nil, nil, err return common.Address{}, nil, nil, err
...@@ -52,7 +52,7 @@ func DeployAlphabetVM(auth *bind.TransactOpts, backend bind.ContractBackend, _ab ...@@ -52,7 +52,7 @@ func DeployAlphabetVM(auth *bind.TransactOpts, backend bind.ContractBackend, _ab
return common.Address{}, nil, nil, errors.New("GetABI returned nil") return common.Address{}, nil, nil, errors.New("GetABI returned nil")
} }
address, tx, contract, err := bind.DeployContract(auth, *parsed, common.FromHex(AlphabetVMBin), backend, _absolutePrestate) address, tx, contract, err := bind.DeployContract(auth, *parsed, common.FromHex(AlphabetVMBin), backend, _absolutePrestate, _oracle)
if err != nil { if err != nil {
return common.Address{}, nil, nil, err return common.Address{}, nil, nil, err
} }
......
packages/contracts-bedrock/scripts/Deploy.s.sol
View file @ 34ed8ff4
...@@ -1076,7 +1076,7 @@ contract Deploy is Deployer { ...@@ -1076,7 +1076,7 @@ contract Deploy is Deployer {
_factory: factory, _factory: factory,
_gameType: GameTypes.ALPHABET, _gameType: GameTypes.ALPHABET,
_absolutePrestate: outputAbsolutePrestate, _absolutePrestate: outputAbsolutePrestate,
_faultVm: IBigStepper(new AlphabetVM(outputAbsolutePrestate)), _faultVm: IBigStepper(new AlphabetVM(outputAbsolutePrestate, PreimageOracle(mustGetAddress("PreimageOracle")))),
// The max depth for the alphabet trace is always 3. Add 1 because split depth is fully inclusive. // The max depth for the alphabet trace is always 3. Add 1 because split depth is fully inclusive.
_maxGameDepth: cfg.faultGameSplitDepth() + 3 + 1, _maxGameDepth: cfg.faultGameSplitDepth() + 3 + 1,
_allowUpgrade: _allowUpgrade _allowUpgrade: _allowUpgrade
......
packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol
View file @ 34ed8ff4
...@@ -49,7 +49,7 @@ contract FaultDisputeGame_Init is DisputeGameFactory_Init { ...@@ -49,7 +49,7 @@ contract FaultDisputeGame_Init is DisputeGameFactory_Init {
// Set the extra data for the game creation // Set the extra data for the game creation
extraData = abi.encode(l2BlockNumber); extraData = abi.encode(l2BlockNumber);
AlphabetVM _vm = new AlphabetVM(absolutePrestate); AlphabetVM _vm = new AlphabetVM(absolutePrestate, new PreimageOracle(0, 0, 0));
// Deploy an implementation of the fault game // Deploy an implementation of the fault game
gameImpl = new FaultDisputeGame({ gameImpl = new FaultDisputeGame({
...@@ -116,7 +116,7 @@ contract FaultDisputeGame_Test is FaultDisputeGame_Init { ...@@ -116,7 +116,7 @@ contract FaultDisputeGame_Test is FaultDisputeGame_Init {
/// @dev Tests that the constructor of the `FaultDisputeGame` reverts when the `_splitDepth` /// @dev Tests that the constructor of the `FaultDisputeGame` reverts when the `_splitDepth`
/// parameter is greater than or equal to the `MAX_GAME_DEPTH` /// parameter is greater than or equal to the `MAX_GAME_DEPTH`
function test_constructor_wrongArgs_reverts(uint256 _splitDepth) public { function test_constructor_wrongArgs_reverts(uint256 _splitDepth) public {
AlphabetVM alphabetVM = new AlphabetVM(absolutePrestate); AlphabetVM alphabetVM = new AlphabetVM(absolutePrestate, new PreimageOracle(0, 0, 0));
// Test that the constructor reverts when the `_splitDepth` parameter is greater than or equal // Test that the constructor reverts when the `_splitDepth` parameter is greater than or equal
// to the `MAX_GAME_DEPTH` parameter. // to the `MAX_GAME_DEPTH` parameter.
......
packages/contracts-bedrock/test/mocks/AlphabetVM.sol
View file @ 34ed8ff4
...@@ -12,9 +12,9 @@ contract AlphabetVM is IBigStepper { ...@@ -12,9 +12,9 @@ contract AlphabetVM is IBigStepper {
Claim internal immutable ABSOLUTE_PRESTATE; Claim internal immutable ABSOLUTE_PRESTATE;
IPreimageOracle public oracle; IPreimageOracle public oracle;
constructor(Claim _absolutePrestate) { constructor(Claim _absolutePrestate, PreimageOracle _oracle) {
ABSOLUTE_PRESTATE = _absolutePrestate; ABSOLUTE_PRESTATE = _absolutePrestate;
oracle = new PreimageOracle(0, 0, 0); oracle = _oracle;
} }
/// @inheritdoc IBigStepper /// @inheritdoc IBigStepper
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment