diff --git a/scripts/create-token.py b/scripts/create-token.py
index 4adbd79b..0bbc09f4 100755
--- a/scripts/create-token.py
+++ b/scripts/create-token.py
@@ -40,7 +40,7 @@ class TokenData:
 
 token_data = TokenData()
 
-req_solc_ver_pat = '^0.8.6'
+req_solc_ver_pat = '^0.8.25'
 
 opts_data = {
 	'text': {
@@ -244,7 +244,7 @@ def check_solc_version():
 		return False
 
 def compile_code(cfg,code):
-	cmd = ['solc','--optimize','--bin','--overwrite']
+	cmd = ['solc', '--optimize', '--bin', '--overwrite', '--evm-version=constantinople']
 	if not cfg.stdout:
 		cmd += ['--output-dir', cfg.outdir or '.']
 	cmd += ['-']
diff --git a/test/cmdtest_py_d/ct_ethdev.py b/test/cmdtest_py_d/ct_ethdev.py
index 5d692fd7..e90cc003 100755
--- a/test/cmdtest_py_d/ct_ethdev.py
+++ b/test/cmdtest_py_d/ct_ethdev.py
@@ -77,14 +77,14 @@ parity_devkey_fn = 'parity.devkey'
 def set_vbals(daemon_id):
 	global vbal1, vbal2, vbal3, vbal4, vbal5, vbal6, vbal7, vbal9
 	if daemon_id == 'geth':
-		vbal1 = '1.2288347'
-		vbal2 = '99.996561415'
-		vbal3 = '1.23141825'
-		vbal4 = '127.0287847'
-		vbal5 = '1000126.14775300512345678'
-		vbal6 = '1000126.14880300512345678'
-		vbal7 = '1000124.91891830512345678'
-		vbal9 = '1.22625235'
+		vbal1 = '1.2288334'
+		vbal2 = '99.996560752'
+		vbal3 = '1.2314176'
+		vbal4 = '127.0287834'
+		vbal5 = '1000126.14775104212345678'
+		vbal6 = '1000126.14880104212345678'
+		vbal7 = '1000124.91891764212345678'
+		vbal9 = '1.2262504'
 	else:
 		vbal1 = '1.2288409'
 		vbal2 = '99.997088755'
diff --git a/test/include/common.py b/test/include/common.py
index 1522ed41..acbdf2d8 100755
--- a/test/include/common.py
+++ b/test/include/common.py
@@ -264,7 +264,7 @@ def test_daemons_ops(*network_ids,op,remove_datadir=False):
 			ret = d.cmd(op,silent=silent)
 		return ret
 
-tested_solc_ver = '0.8.7'
+tested_solc_ver = '0.8.26'
 
 def check_solc_ver():
 	cmd = 'python3 scripts/create-token.py --check-solc-version'
diff --git a/test/ref/ethereum/bin/mm1/Owned.bin b/test/ref/ethereum/bin/mm1/Owned.bin
index d7bdfdde..ffbe41c6 100644
--- a/test/ref/ethereum/bin/mm1/Owned.bin
+++ b/test/ref/ethereum/bin/mm1/Owned.bin
@@ -1 +1 @@
-608060405234801561001057600080fd5b50600080546001600160a01b031916331790556101ee806100326000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806379ba5097146100515780638da5cb5b1461005b578063d4ee1d901461008a578063f2fde38b1461009d575b600080fd5b6100596100b0565b005b60005461006e906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60015461006e906001600160a01b031681565b6100596100ab366004610164565b61012b565b6001546001600160a01b031633146100c757600080fd5b600154600080546040516001600160a01b0393841693909116917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a360018054600080546001600160a01b03199081166001600160a01b03841617909155169055565b6000546001600160a01b0316331461014257600080fd5b600180546001600160a01b0319166001600160a01b0392909216919091179055565b60006020828403121561017657600080fd5b81356001600160a01b038116811461018d57600080fd5b939250505056fea2646970667358221220ae657b40ff88ded29197eceae8a915399ab77698660d03f48c64ec6b06bd6a7f64736f6c637826302e382e372d646576656c6f702e323032312e392e322b636f6d6d69742e65323864303061370057
\ No newline at end of file
+6080604052348015600f57600080fd5b50600080546001600160a01b031916331790556101ca806100316000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806379ba5097146100515780638da5cb5b1461005b578063d4ee1d901461008a578063f2fde38b1461009d575b600080fd5b6100596100b0565b005b60005461006e906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60015461006e906001600160a01b031681565b6100596100ab366004610164565b61012b565b6001546001600160a01b031633146100c757600080fd5b600154600080546040516001600160a01b0393841693909116917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a360018054600080546001600160a01b03199081166001600160a01b03841617909155169055565b6000546001600160a01b0316331461014257600080fd5b600180546001600160a01b0319166001600160a01b0392909216919091179055565b60006020828403121561017657600080fd5b81356001600160a01b038116811461018d57600080fd5b939250505056fea2646970667358221220753b861e238bb3d63db2e33ca567ec12713d8df6763b3d89baf357e82f19504164736f6c634300081a0033
\ No newline at end of file
diff --git a/test/ref/ethereum/bin/mm1/SafeMath.bin b/test/ref/ethereum/bin/mm1/SafeMath.bin
index a8298548..33c9b1b4 100644
--- a/test/ref/ethereum/bin/mm1/SafeMath.bin
+++ b/test/ref/ethereum/bin/mm1/SafeMath.bin
@@ -1 +1 @@
-608060405234801561001057600080fd5b50610236806100206000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c8063a293d1e814610051578063b5931f7c14610076578063d05c78da14610089578063e6cb90131461009c575b600080fd5b61006461005f366004610134565b6100af565b60405190815260200160405180910390f35b610064610084366004610134565b6100cf565b610064610097366004610134565b6100e7565b6100646100aa366004610134565b610119565b6000828211156100be57600080fd5b6100c882846101af565b9392505050565b60008082116100dd57600080fd5b6100c8828461016e565b60006100f38284610190565b905082158061010a575081610108848361016e565b145b61011357600080fd5b92915050565b60006101258284610156565b90508281101561011357600080fd5b6000806040838503121561014757600080fd5b50508035926020909101359150565b60008219821115610169576101696101c6565b500190565b60008261018b57634e487b7160e01b600052601260045260246000fd5b500490565b60008160001904831182151516156101aa576101aa6101c6565b500290565b6000828210156101c1576101c16101c6565b500390565b634e487b7160e01b600052601160045260246000fdfea2646970667358221220787ea5f6bce767210dea641f15ebac9a6a29e9fab9c3481876098f52a53040f164736f6c637826302e382e372d646576656c6f702e323032312e392e322b636f6d6d69742e65323864303061370057
\ No newline at end of file
+6080604052348015600f57600080fd5b506102018061001f6000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c8063a293d1e814610051578063b5931f7c14610076578063d05c78da14610089578063e6cb90131461009c575b600080fd5b61006461005f366004610134565b6100af565b60405190815260200160405180910390f35b610064610084366004610134565b6100cf565b610064610097366004610134565b6100e7565b6100646100aa366004610134565b610119565b6000828211156100be57600080fd5b6100c8828461016c565b9392505050565b60008082116100dd57600080fd5b6100c8828461017f565b60006100f382846101a1565b905082158061010a575081610108848361017f565b145b61011357600080fd5b92915050565b600061012582846101b8565b90508281101561011357600080fd5b6000806040838503121561014757600080fd5b50508035926020909101359150565b634e487b7160e01b600052601160045260246000fd5b8181038181111561011357610113610156565b60008261019c57634e487b7160e01b600052601260045260246000fd5b500490565b808202811582820484141761011357610113610156565b808201808211156101135761011361015656fea264697066735822122097725adbfd95de152ccd465022a0484255d9f8e140e9fd4c31b4ea4a7cea4b1064736f6c634300081a0033
\ No newline at end of file
diff --git a/test/ref/ethereum/bin/mm1/Token.bin b/test/ref/ethereum/bin/mm1/Token.bin
index 08ab15b4..2f75f020 100644
--- a/test/ref/ethereum/bin/mm1/Token.bin
+++ b/test/ref/ethereum/bin/mm1/Token.bin
@@ -1 +1 @@
-608060405234801561001057600080fd5b50600080546001600160a01b03191633179055604080518082019091526003808252624d4d3160e81b602090920191825261004d91600291610126565b5060408051808201909152600d8082526c4d4d47656e20546f6b656e203160981b602090920191825261008291600391610126565b506004805460ff191660121790556a52b7d2dcc80cd2e4000000600581905572a329c0648769a73afac7f9381e08fb43dbea72600081815260066020527f83c15b9796d28cef5540f5a6b1b5d5fd40dfaff971c603dacfb5418f44d0d21b839055604051919290917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef916101199190815260200190565b60405180910390a36101fa565b828054610132906101bf565b90600052602060002090601f016020900481019282610154576000855561019a565b82601f1061016d57805160ff191683800117855561019a565b8280016001018555821561019a579182015b8281111561019a57825182559160200191906001019061017f565b506101a69291506101aa565b5090565b5b808211156101a657600081556001016101ab565b600181811c908216806101d357607f821691505b602082108114156101f457634e487b7160e01b600052602260045260246000fd5b50919050565b610a1f806102096000396000f3fe608060405234801561001057600080fd5b50600436106101215760003560e01c806395d89b41116100ad578063d4ee1d9011610071578063d4ee1d901461026a578063dc39d06d1461027d578063dd62ed3e14610290578063e6cb9013146102c9578063f2fde38b146102dc57600080fd5b806395d89b4114610216578063a293d1e81461021e578063a9059cbb14610231578063b5931f7c14610244578063d05c78da1461025757600080fd5b8063313ce567116100f4578063313ce567146101905780633eaaf86b146101af57806370a08231146101b857806379ba5097146101e15780638da5cb5b146101eb57600080fd5b806306fdde0314610126578063095ea7b31461014457806318160ddd1461016757806323b872dd1461017d575b600080fd5b61012e6102ef565b60405161013b91906108af565b60405180910390f35b610157610152366004610841565b61037d565b604051901515815260200161013b565b61016f6103ea565b60405190815260200161013b565b61015761018b366004610805565b610428565b60045461019d9060ff1681565b60405160ff909116815260200161013b565b61016f60055481565b61016f6101c63660046107b7565b6001600160a01b031660009081526006602052604090205490565b6101e9610526565b005b6000546101fe906001600160a01b031681565b6040516001600160a01b03909116815260200161013b565b61012e6105a1565b61016f61022c36600461088d565b6105ae565b61015761023f366004610841565b6105ce565b61016f61025236600461088d565b610665565b61016f61026536600461088d565b61067d565b6001546101fe906001600160a01b031681565b61015761028b366004610841565b6106a9565b61016f61029e3660046107d2565b6001600160a01b03918216600090815260076020908152604080832093909416825291909152205490565b61016f6102d736600461088d565b610747565b6101e96102ea3660046107b7565b610762565b600380546102fc90610974565b80601f016020809104026020016040519081016040528092919081815260200182805461032890610974565b80156103755780601f1061034a57610100808354040283529160200191610375565b820191906000526020600020905b81548152906001019060200180831161035857829003601f168201915b505050505081565b3360008181526007602090815260408083206001600160a01b038716808552925280832085905551919290917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925906103d89086815260200190565b60405180910390a35060015b92915050565b600080805260066020527f54cdd369e4e8a8515e52ca72ec816c2101831ad1f18bf44102ed171459c9b4f854600554610423919061095d565b905090565b6001600160a01b03831660009081526006602052604081205461044b90836105ae565b6001600160a01b038516600090815260066020908152604080832093909355600781528282203383529052205461048290836105ae565b6001600160a01b0380861660009081526007602090815260408083203384528252808320949094559186168152600690915220546104c09083610747565b6001600160a01b0380851660008181526006602052604090819020939093559151908616907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906105149086815260200190565b60405180910390a35060019392505050565b6001546001600160a01b0316331461053d57600080fd5b600154600080546040516001600160a01b0393841693909116917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a360018054600080546001600160a01b03199081166001600160a01b03841617909155169055565b600280546102fc90610974565b6000828211156105bd57600080fd5b6105c7828461095d565b9392505050565b336000908152600660205260408120546105e890836105ae565b33600090815260066020526040808220929092556001600160a01b038516815220546106149083610747565b6001600160a01b0384166000818152600660205260409081902092909255905133907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906103d89086815260200190565b600080821161067357600080fd5b6105c7828461091c565b6000610689828461093e565b90508215806106a057508161069e848361091c565b145b6103e457600080fd5b600080546001600160a01b031633146106c157600080fd5b60005460405163a9059cbb60e01b81526001600160a01b039182166004820152602481018490529084169063a9059cbb90604401602060405180830381600087803b15801561070f57600080fd5b505af1158015610723573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105c7919061086b565b60006107538284610904565b9050828110156103e457600080fd5b6000546001600160a01b0316331461077957600080fd5b600180546001600160a01b0319166001600160a01b0392909216919091179055565b80356001600160a01b03811681146107b257600080fd5b919050565b6000602082840312156107c957600080fd5b6105c78261079b565b600080604083850312156107e557600080fd5b6107ee8361079b565b91506107fc6020840161079b565b90509250929050565b60008060006060848603121561081a57600080fd5b6108238461079b565b92506108316020850161079b565b9150604084013590509250925092565b6000806040838503121561085457600080fd5b61085d8361079b565b946020939093013593505050565b60006020828403121561087d57600080fd5b815180151581146105c757600080fd5b600080604083850312156108a057600080fd5b50508035926020909101359150565b600060208083528351808285015260005b818110156108dc578581018301518582016040015282016108c0565b818111156108ee576000604083870101525b50601f01601f1916929092016040019392505050565b60008219821115610917576109176109af565b500190565b60008261093957634e487b7160e01b600052601260045260246000fd5b500490565b6000816000190483118215151615610958576109586109af565b500290565b60008282101561096f5761096f6109af565b500390565b600181811c9082168061098857607f821691505b602082108114156109a957634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fdfea2646970667358221220760ff6b36b89b5b3759c4e77eb04861c9d61f294c3a73fda16c0d6b8dc82a99264736f6c637826302e382e372d646576656c6f702e323032312e392e322b636f6d6d69742e65323864303061370057
\ No newline at end of file
+608060405234801561001057600080fd5b50600080546001600160a01b0319163317905560408051808201909152600381527f4d4d3100000000000000000000000000000000000000000000000000000000006020820152600290610064908261021b565b5060408051808201909152600d81527f4d4d47656e20546f6b656e20310000000000000000000000000000000000000060208201526003906100a6908261021b565b506004805460ff191660121790556a52b7d2dcc80cd2e4000000600581905572a329c0648769a73afac7f9381e08fb43dbea72600081815260066020527f83c15b9796d28cef5540f5a6b1b5d5fd40dfaff971c603dacfb5418f44d0d21b839055604051919290917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9161013d9190815260200190565b60405180910390a36102d9565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600181811c9082168061018d57607f821691505b6020821081036101c6577f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b50919050565b601f82111561021657806000526020600020601f840160051c810160208510156101f35750805b601f840160051c820191505b8181101561021357600081556001016101ff565b50505b505050565b81516001600160401b038111156102345761023461014a565b610248816102428454610179565b846101cc565b6020601f82116001811461027c57600083156102645750848201515b600019600385901b1c1916600184901b178455610213565b600084815260208120601f198516915b828110156102ac578785015182556020948501946001909201910161028c565b50848210156102ca5786840151600019600387901b60f8161c191681555b50505050600190811b01905550565b6109d4806102e86000396000f3fe608060405234801561001057600080fd5b50600436106101215760003560e01c806395d89b41116100ad578063d4ee1d9011610071578063d4ee1d901461026a578063dc39d06d1461027d578063dd62ed3e14610290578063e6cb9013146102c9578063f2fde38b146102dc57600080fd5b806395d89b4114610216578063a293d1e81461021e578063a9059cbb14610231578063b5931f7c14610244578063d05c78da1461025757600080fd5b8063313ce567116100f4578063313ce567146101905780633eaaf86b146101af57806370a08231146101b857806379ba5097146101e15780638da5cb5b146101eb57600080fd5b806306fdde0314610126578063095ea7b31461014457806318160ddd1461016757806323b872dd1461017d575b600080fd5b61012e6102ef565b60405161013b919061078c565b60405180910390f35b6101576101523660046107f6565b61037d565b604051901515815260200161013b565b61016f6103ea565b60405190815260200161013b565b61015761018b366004610820565b610428565b60045461019d9060ff1681565b60405160ff909116815260200161013b565b61016f60055481565b61016f6101c636600461085d565b6001600160a01b031660009081526006602052604090205490565b6101e9610526565b005b6000546101fe906001600160a01b031681565b6040516001600160a01b03909116815260200161013b565b61012e6105a1565b61016f61022c366004610878565b6105ae565b61015761023f3660046107f6565b6105ce565b61016f610252366004610878565b610665565b61016f610265366004610878565b61067d565b6001546101fe906001600160a01b031681565b61015761028b3660046107f6565b6106a9565b61016f61029e36600461089a565b6001600160a01b03918216600090815260076020908152604080832093909416825291909152205490565b61016f6102d7366004610878565b610738565b6101e96102ea36600461085d565b610753565b600380546102fc906108cd565b80601f0160208091040260200160405190810160405280929190818152602001828054610328906108cd565b80156103755780601f1061034a57610100808354040283529160200191610375565b820191906000526020600020905b81548152906001019060200180831161035857829003601f168201915b505050505081565b3360008181526007602090815260408083206001600160a01b038716808552925280832085905551919290917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925906103d89086815260200190565b60405180910390a35060015b92915050565b600080805260066020527f54cdd369e4e8a8515e52ca72ec816c2101831ad1f18bf44102ed171459c9b4f854600554610423919061091d565b905090565b6001600160a01b03831660009081526006602052604081205461044b90836105ae565b6001600160a01b038516600090815260066020908152604080832093909355600781528282203383529052205461048290836105ae565b6001600160a01b0380861660009081526007602090815260408083203384528252808320949094559186168152600690915220546104c09083610738565b6001600160a01b0380851660008181526006602052604090819020939093559151908616907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906105149086815260200190565b60405180910390a35060019392505050565b6001546001600160a01b0316331461053d57600080fd5b600154600080546040516001600160a01b0393841693909116917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a360018054600080546001600160a01b03199081166001600160a01b03841617909155169055565b600280546102fc906108cd565b6000828211156105bd57600080fd5b6105c7828461091d565b9392505050565b336000908152600660205260408120546105e890836105ae565b33600090815260066020526040808220929092556001600160a01b038516815220546106149083610738565b6001600160a01b0384166000818152600660205260409081902092909255905133907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906103d89086815260200190565b600080821161067357600080fd5b6105c78284610930565b60006106898284610952565b90508215806106a057508161069e8483610930565b145b6103e457600080fd5b600080546001600160a01b031633146106c157600080fd5b60005460405163a9059cbb60e01b81526001600160a01b039182166004820152602481018490529084169063a9059cbb906044016020604051808303816000875af1158015610714573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105c79190610969565b6000610744828461098b565b9050828110156103e457600080fd5b6000546001600160a01b0316331461076a57600080fd5b600180546001600160a01b0319166001600160a01b0392909216919091179055565b602081526000825180602084015260005b818110156107ba576020818601810151604086840101520161079d565b506000604082850101526040601f19601f83011684010191505092915050565b80356001600160a01b03811681146107f157600080fd5b919050565b6000806040838503121561080957600080fd5b610812836107da565b946020939093013593505050565b60008060006060848603121561083557600080fd5b61083e846107da565b925061084c602085016107da565b929592945050506040919091013590565b60006020828403121561086f57600080fd5b6105c7826107da565b6000806040838503121561088b57600080fd5b50508035926020909101359150565b600080604083850312156108ad57600080fd5b6108b6836107da565b91506108c4602084016107da565b90509250929050565b600181811c908216806108e157607f821691505b60208210810361090157634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b818103818111156103e4576103e4610907565b60008261094d57634e487b7160e01b600052601260045260246000fd5b500490565b80820281158282048414176103e4576103e4610907565b60006020828403121561097b57600080fd5b815180151581146105c757600080fd5b808201808211156103e4576103e461090756fea2646970667358221220bf4b890412693761748368a5c002a97360297254c234ce0ca57eee55fffdc89c64736f6c634300081a0033
\ No newline at end of file
diff --git a/test/ref/ethereum/bin/mm2/Owned.bin b/test/ref/ethereum/bin/mm2/Owned.bin
index e05deb22..c166c1e3 100644
--- a/test/ref/ethereum/bin/mm2/Owned.bin
+++ b/test/ref/ethereum/bin/mm2/Owned.bin
@@ -1 +1 @@
-608060405234801561001057600080fd5b50600080546001600160a01b031916331790556101ee806100326000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806379ba5097146100515780638da5cb5b1461005b578063d4ee1d901461008a578063f2fde38b1461009d575b600080fd5b6100596100b0565b005b60005461006e906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60015461006e906001600160a01b031681565b6100596100ab366004610164565b61012b565b6001546001600160a01b031633146100c757600080fd5b600154600080546040516001600160a01b0393841693909116917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a360018054600080546001600160a01b03199081166001600160a01b03841617909155169055565b6000546001600160a01b0316331461014257600080fd5b600180546001600160a01b0319166001600160a01b0392909216919091179055565b60006020828403121561017657600080fd5b81356001600160a01b038116811461018d57600080fd5b939250505056fea264697066735822122047fa29a36759a9eb4b1e91452e0c159bd2054d3b02a8de130170a1c3cacc5ab364736f6c637826302e382e372d646576656c6f702e323032312e392e322b636f6d6d69742e65323864303061370057
\ No newline at end of file
+6080604052348015600f57600080fd5b50600080546001600160a01b031916331790556101ca806100316000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806379ba5097146100515780638da5cb5b1461005b578063d4ee1d901461008a578063f2fde38b1461009d575b600080fd5b6100596100b0565b005b60005461006e906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60015461006e906001600160a01b031681565b6100596100ab366004610164565b61012b565b6001546001600160a01b031633146100c757600080fd5b600154600080546040516001600160a01b0393841693909116917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a360018054600080546001600160a01b03199081166001600160a01b03841617909155169055565b6000546001600160a01b0316331461014257600080fd5b600180546001600160a01b0319166001600160a01b0392909216919091179055565b60006020828403121561017657600080fd5b81356001600160a01b038116811461018d57600080fd5b939250505056fea26469706673582212207e4b273348d72ecdc7cf4a4ca038db901a3891d68822ce13cabf12caf9bcc0a164736f6c634300081a0033
\ No newline at end of file
diff --git a/test/ref/ethereum/bin/mm2/SafeMath.bin b/test/ref/ethereum/bin/mm2/SafeMath.bin
index 61b8c4ff..d75558e1 100644
--- a/test/ref/ethereum/bin/mm2/SafeMath.bin
+++ b/test/ref/ethereum/bin/mm2/SafeMath.bin
@@ -1 +1 @@
-608060405234801561001057600080fd5b50610236806100206000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c8063a293d1e814610051578063b5931f7c14610076578063d05c78da14610089578063e6cb90131461009c575b600080fd5b61006461005f366004610134565b6100af565b60405190815260200160405180910390f35b610064610084366004610134565b6100cf565b610064610097366004610134565b6100e7565b6100646100aa366004610134565b610119565b6000828211156100be57600080fd5b6100c882846101af565b9392505050565b60008082116100dd57600080fd5b6100c8828461016e565b60006100f38284610190565b905082158061010a575081610108848361016e565b145b61011357600080fd5b92915050565b60006101258284610156565b90508281101561011357600080fd5b6000806040838503121561014757600080fd5b50508035926020909101359150565b60008219821115610169576101696101c6565b500190565b60008261018b57634e487b7160e01b600052601260045260246000fd5b500490565b60008160001904831182151516156101aa576101aa6101c6565b500290565b6000828210156101c1576101c16101c6565b500390565b634e487b7160e01b600052601160045260246000fdfea264697066735822122042074ef5f18b7cea61585b0be08e9826b01811ebb4e161768017624ecf101ef564736f6c637826302e382e372d646576656c6f702e323032312e392e322b636f6d6d69742e65323864303061370057
\ No newline at end of file
+6080604052348015600f57600080fd5b506102018061001f6000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c8063a293d1e814610051578063b5931f7c14610076578063d05c78da14610089578063e6cb90131461009c575b600080fd5b61006461005f366004610134565b6100af565b60405190815260200160405180910390f35b610064610084366004610134565b6100cf565b610064610097366004610134565b6100e7565b6100646100aa366004610134565b610119565b6000828211156100be57600080fd5b6100c8828461016c565b9392505050565b60008082116100dd57600080fd5b6100c8828461017f565b60006100f382846101a1565b905082158061010a575081610108848361017f565b145b61011357600080fd5b92915050565b600061012582846101b8565b90508281101561011357600080fd5b6000806040838503121561014757600080fd5b50508035926020909101359150565b634e487b7160e01b600052601160045260246000fd5b8181038181111561011357610113610156565b60008261019c57634e487b7160e01b600052601260045260246000fd5b500490565b808202811582820484141761011357610113610156565b808201808211156101135761011361015656fea26469706673582212201cf0b7a7485b7a36525143495634ad03d923e70ff68d3b74b2ee89b85be8d59764736f6c634300081a0033
\ No newline at end of file
diff --git a/test/ref/ethereum/bin/mm2/Token.bin b/test/ref/ethereum/bin/mm2/Token.bin
index edcd809d..def33b75 100644
--- a/test/ref/ethereum/bin/mm2/Token.bin
+++ b/test/ref/ethereum/bin/mm2/Token.bin
@@ -1 +1 @@
-608060405234801561001057600080fd5b50600080546001600160a01b031916331790556040805180820190915260038082526226a69960e91b602090920191825261004d91600291610123565b5060408051808201909152600d8082526c26a6a3b2b7102a37b5b2b7101960991b602090920191825261008291600391610123565b506004805460ff1916600a179055670de0b6b3a7640000600581905572a329c0648769a73afac7f9381e08fb43dbea72600081815260066020527f83c15b9796d28cef5540f5a6b1b5d5fd40dfaff971c603dacfb5418f44d0d21b839055604051919290917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef916101169190815260200190565b60405180910390a36101f7565b82805461012f906101bc565b90600052602060002090601f0160209004810192826101515760008555610197565b82601f1061016a57805160ff1916838001178555610197565b82800160010185558215610197579182015b8281111561019757825182559160200191906001019061017c565b506101a39291506101a7565b5090565b5b808211156101a357600081556001016101a8565b600181811c908216806101d057607f821691505b602082108114156101f157634e487b7160e01b600052602260045260246000fd5b50919050565b610a1f806102066000396000f3fe608060405234801561001057600080fd5b50600436106101215760003560e01c806395d89b41116100ad578063d4ee1d9011610071578063d4ee1d901461026a578063dc39d06d1461027d578063dd62ed3e14610290578063e6cb9013146102c9578063f2fde38b146102dc57600080fd5b806395d89b4114610216578063a293d1e81461021e578063a9059cbb14610231578063b5931f7c14610244578063d05c78da1461025757600080fd5b8063313ce567116100f4578063313ce567146101905780633eaaf86b146101af57806370a08231146101b857806379ba5097146101e15780638da5cb5b146101eb57600080fd5b806306fdde0314610126578063095ea7b31461014457806318160ddd1461016757806323b872dd1461017d575b600080fd5b61012e6102ef565b60405161013b91906108af565b60405180910390f35b610157610152366004610841565b61037d565b604051901515815260200161013b565b61016f6103ea565b60405190815260200161013b565b61015761018b366004610805565b610428565b60045461019d9060ff1681565b60405160ff909116815260200161013b565b61016f60055481565b61016f6101c63660046107b7565b6001600160a01b031660009081526006602052604090205490565b6101e9610526565b005b6000546101fe906001600160a01b031681565b6040516001600160a01b03909116815260200161013b565b61012e6105a1565b61016f61022c36600461088d565b6105ae565b61015761023f366004610841565b6105ce565b61016f61025236600461088d565b610665565b61016f61026536600461088d565b61067d565b6001546101fe906001600160a01b031681565b61015761028b366004610841565b6106a9565b61016f61029e3660046107d2565b6001600160a01b03918216600090815260076020908152604080832093909416825291909152205490565b61016f6102d736600461088d565b610747565b6101e96102ea3660046107b7565b610762565b600380546102fc90610974565b80601f016020809104026020016040519081016040528092919081815260200182805461032890610974565b80156103755780601f1061034a57610100808354040283529160200191610375565b820191906000526020600020905b81548152906001019060200180831161035857829003601f168201915b505050505081565b3360008181526007602090815260408083206001600160a01b038716808552925280832085905551919290917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925906103d89086815260200190565b60405180910390a35060015b92915050565b600080805260066020527f54cdd369e4e8a8515e52ca72ec816c2101831ad1f18bf44102ed171459c9b4f854600554610423919061095d565b905090565b6001600160a01b03831660009081526006602052604081205461044b90836105ae565b6001600160a01b038516600090815260066020908152604080832093909355600781528282203383529052205461048290836105ae565b6001600160a01b0380861660009081526007602090815260408083203384528252808320949094559186168152600690915220546104c09083610747565b6001600160a01b0380851660008181526006602052604090819020939093559151908616907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906105149086815260200190565b60405180910390a35060019392505050565b6001546001600160a01b0316331461053d57600080fd5b600154600080546040516001600160a01b0393841693909116917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a360018054600080546001600160a01b03199081166001600160a01b03841617909155169055565b600280546102fc90610974565b6000828211156105bd57600080fd5b6105c7828461095d565b9392505050565b336000908152600660205260408120546105e890836105ae565b33600090815260066020526040808220929092556001600160a01b038516815220546106149083610747565b6001600160a01b0384166000818152600660205260409081902092909255905133907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906103d89086815260200190565b600080821161067357600080fd5b6105c7828461091c565b6000610689828461093e565b90508215806106a057508161069e848361091c565b145b6103e457600080fd5b600080546001600160a01b031633146106c157600080fd5b60005460405163a9059cbb60e01b81526001600160a01b039182166004820152602481018490529084169063a9059cbb90604401602060405180830381600087803b15801561070f57600080fd5b505af1158015610723573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105c7919061086b565b60006107538284610904565b9050828110156103e457600080fd5b6000546001600160a01b0316331461077957600080fd5b600180546001600160a01b0319166001600160a01b0392909216919091179055565b80356001600160a01b03811681146107b257600080fd5b919050565b6000602082840312156107c957600080fd5b6105c78261079b565b600080604083850312156107e557600080fd5b6107ee8361079b565b91506107fc6020840161079b565b90509250929050565b60008060006060848603121561081a57600080fd5b6108238461079b565b92506108316020850161079b565b9150604084013590509250925092565b6000806040838503121561085457600080fd5b61085d8361079b565b946020939093013593505050565b60006020828403121561087d57600080fd5b815180151581146105c757600080fd5b600080604083850312156108a057600080fd5b50508035926020909101359150565b600060208083528351808285015260005b818110156108dc578581018301518582016040015282016108c0565b818111156108ee576000604083870101525b50601f01601f1916929092016040019392505050565b60008219821115610917576109176109af565b500190565b60008261093957634e487b7160e01b600052601260045260246000fd5b500490565b6000816000190483118215151615610958576109586109af565b500290565b60008282101561096f5761096f6109af565b500390565b600181811c9082168061098857607f821691505b602082108114156109a957634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fdfea26469706673582212206b8bd42c577ab60f33c94d98b00d0747a7e4737b4015d69f009feb4ce2c26a7764736f6c637826302e382e372d646576656c6f702e323032312e392e322b636f6d6d69742e65323864303061370057
\ No newline at end of file
+608060405234801561001057600080fd5b50600080546001600160a01b0319163317905560408051808201909152600381527f4d4d32000000000000000000000000000000000000000000000000000000000060208201526002906100649082610218565b5060408051808201909152600d81527f4d4d47656e20546f6b656e20320000000000000000000000000000000000000060208201526003906100a69082610218565b506004805460ff1916600a179055670de0b6b3a7640000600581905572a329c0648769a73afac7f9381e08fb43dbea72600081815260066020527f83c15b9796d28cef5540f5a6b1b5d5fd40dfaff971c603dacfb5418f44d0d21b839055604051919290917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9161013a9190815260200190565b60405180910390a36102d6565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600181811c9082168061018a57607f821691505b6020821081036101c3577f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b50919050565b601f82111561021357806000526020600020601f840160051c810160208510156101f05750805b601f840160051c820191505b8181101561021057600081556001016101fc565b50505b505050565b81516001600160401b0381111561023157610231610147565b6102458161023f8454610176565b846101c9565b6020601f82116001811461027957600083156102615750848201515b600019600385901b1c1916600184901b178455610210565b600084815260208120601f198516915b828110156102a95787850151825560209485019460019092019101610289565b50848210156102c75786840151600019600387901b60f8161c191681555b50505050600190811b01905550565b6109d4806102e56000396000f3fe608060405234801561001057600080fd5b50600436106101215760003560e01c806395d89b41116100ad578063d4ee1d9011610071578063d4ee1d901461026a578063dc39d06d1461027d578063dd62ed3e14610290578063e6cb9013146102c9578063f2fde38b146102dc57600080fd5b806395d89b4114610216578063a293d1e81461021e578063a9059cbb14610231578063b5931f7c14610244578063d05c78da1461025757600080fd5b8063313ce567116100f4578063313ce567146101905780633eaaf86b146101af57806370a08231146101b857806379ba5097146101e15780638da5cb5b146101eb57600080fd5b806306fdde0314610126578063095ea7b31461014457806318160ddd1461016757806323b872dd1461017d575b600080fd5b61012e6102ef565b60405161013b919061078c565b60405180910390f35b6101576101523660046107f6565b61037d565b604051901515815260200161013b565b61016f6103ea565b60405190815260200161013b565b61015761018b366004610820565b610428565b60045461019d9060ff1681565b60405160ff909116815260200161013b565b61016f60055481565b61016f6101c636600461085d565b6001600160a01b031660009081526006602052604090205490565b6101e9610526565b005b6000546101fe906001600160a01b031681565b6040516001600160a01b03909116815260200161013b565b61012e6105a1565b61016f61022c366004610878565b6105ae565b61015761023f3660046107f6565b6105ce565b61016f610252366004610878565b610665565b61016f610265366004610878565b61067d565b6001546101fe906001600160a01b031681565b61015761028b3660046107f6565b6106a9565b61016f61029e36600461089a565b6001600160a01b03918216600090815260076020908152604080832093909416825291909152205490565b61016f6102d7366004610878565b610738565b6101e96102ea36600461085d565b610753565b600380546102fc906108cd565b80601f0160208091040260200160405190810160405280929190818152602001828054610328906108cd565b80156103755780601f1061034a57610100808354040283529160200191610375565b820191906000526020600020905b81548152906001019060200180831161035857829003601f168201915b505050505081565b3360008181526007602090815260408083206001600160a01b038716808552925280832085905551919290917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925906103d89086815260200190565b60405180910390a35060015b92915050565b600080805260066020527f54cdd369e4e8a8515e52ca72ec816c2101831ad1f18bf44102ed171459c9b4f854600554610423919061091d565b905090565b6001600160a01b03831660009081526006602052604081205461044b90836105ae565b6001600160a01b038516600090815260066020908152604080832093909355600781528282203383529052205461048290836105ae565b6001600160a01b0380861660009081526007602090815260408083203384528252808320949094559186168152600690915220546104c09083610738565b6001600160a01b0380851660008181526006602052604090819020939093559151908616907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906105149086815260200190565b60405180910390a35060019392505050565b6001546001600160a01b0316331461053d57600080fd5b600154600080546040516001600160a01b0393841693909116917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a360018054600080546001600160a01b03199081166001600160a01b03841617909155169055565b600280546102fc906108cd565b6000828211156105bd57600080fd5b6105c7828461091d565b9392505050565b336000908152600660205260408120546105e890836105ae565b33600090815260066020526040808220929092556001600160a01b038516815220546106149083610738565b6001600160a01b0384166000818152600660205260409081902092909255905133907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906103d89086815260200190565b600080821161067357600080fd5b6105c78284610930565b60006106898284610952565b90508215806106a057508161069e8483610930565b145b6103e457600080fd5b600080546001600160a01b031633146106c157600080fd5b60005460405163a9059cbb60e01b81526001600160a01b039182166004820152602481018490529084169063a9059cbb906044016020604051808303816000875af1158015610714573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105c79190610969565b6000610744828461098b565b9050828110156103e457600080fd5b6000546001600160a01b0316331461076a57600080fd5b600180546001600160a01b0319166001600160a01b0392909216919091179055565b602081526000825180602084015260005b818110156107ba576020818601810151604086840101520161079d565b506000604082850101526040601f19601f83011684010191505092915050565b80356001600160a01b03811681146107f157600080fd5b919050565b6000806040838503121561080957600080fd5b610812836107da565b946020939093013593505050565b60008060006060848603121561083557600080fd5b61083e846107da565b925061084c602085016107da565b929592945050506040919091013590565b60006020828403121561086f57600080fd5b6105c7826107da565b6000806040838503121561088b57600080fd5b50508035926020909101359150565b600080604083850312156108ad57600080fd5b6108b6836107da565b91506108c4602084016107da565b90509250929050565b600181811c908216806108e157607f821691505b60208210810361090157634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b818103818111156103e4576103e4610907565b60008261094d57634e487b7160e01b600052601260045260246000fd5b500490565b80820281158282048414176103e4576103e4610907565b60006020828403121561097b57600080fd5b815180151581146105c757600080fd5b808201808211156103e4576103e461090756fea26469706673582212201f4d5c97919cb0389ea6a2926f8c37729d4e5e6ee846f788081199a42c5ed1e664736f6c634300081a0033
\ No newline at end of file